Page MenuHomeFreeBSD

D27066.diff
No OneTemporary

D27066.diff

Index: head/sys/opencrypto/crypto.c
===================================================================
--- head/sys/opencrypto/crypto.c
+++ head/sys/opencrypto/crypto.c
@@ -286,7 +286,9 @@
}
/* It'd be nice if we could store these in some kind of secure memory... */
-struct keybuf * get_keybuf(void) {
+struct keybuf *
+get_keybuf(void)
+{
return (keybuf);
}
Index: head/sys/opencrypto/cryptodev.c
===================================================================
--- head/sys/opencrypto/cryptodev.c
+++ head/sys/opencrypto/cryptodev.c
@@ -351,13 +351,13 @@
&warninterval,
"Delay in seconds between warnings of deprecated /dev/crypto algorithms");
-static int cryptof_ioctl(struct file *, u_long, void *,
- struct ucred *, struct thread *);
-static int cryptof_stat(struct file *, struct stat *,
- struct ucred *, struct thread *);
-static int cryptof_close(struct file *, struct thread *);
-static int cryptof_fill_kinfo(struct file *, struct kinfo_file *,
- struct filedesc *);
+static int cryptof_ioctl(struct file *, u_long, void *, struct ucred *,
+ struct thread *);
+static int cryptof_stat(struct file *, struct stat *, struct ucred *,
+ struct thread *);
+static int cryptof_close(struct file *, struct thread *);
+static int cryptof_fill_kinfo(struct file *, struct kinfo_file *,
+ struct filedesc *);
static struct fileops cryptofops = {
.fo_read = invfo_rdwr,
@@ -381,12 +381,12 @@
struct auth_hash *, void *);
static void csefree(struct csession *);
-static int cryptodev_op(struct csession *, const struct crypt_op *,
- struct ucred *, struct thread *td);
-static int cryptodev_aead(struct csession *, struct crypt_aead *,
- struct ucred *, struct thread *);
-static int cryptodev_key(struct crypt_kop *);
-static int cryptodev_find(struct crypt_find_op *);
+static int cryptodev_op(struct csession *, const struct crypt_op *,
+ struct ucred *, struct thread *);
+static int cryptodev_aead(struct csession *, struct crypt_aead *,
+ struct ucred *, struct thread *);
+static int cryptodev_key(struct crypt_kop *);
+static int cryptodev_find(struct crypt_find_op *);
/*
* Check a crypto identifier to see if it requested
@@ -417,12 +417,8 @@
/* ARGSUSED */
static int
-cryptof_ioctl(
- struct file *fp,
- u_long cmd,
- void *data,
- struct ucred *active_cred,
- struct thread *td)
+cryptof_ioctl(struct file *fp, u_long cmd, void *data,
+ struct ucred *active_cred, struct thread *td)
{
static struct timeval keywarn, featwarn;
struct crypto_session_params csp;
@@ -940,11 +936,8 @@
}
static int
-cryptodev_op(
- struct csession *cse,
- const struct crypt_op *cop,
- struct ucred *active_cred,
- struct thread *td)
+cryptodev_op(struct csession *cse, const struct crypt_op *cop,
+ struct ucred *active_cred, struct thread *td)
{
struct cryptop_data *cod = NULL;
struct cryptop *crp = NULL;
@@ -1154,11 +1147,8 @@
}
static int
-cryptodev_aead(
- struct csession *cse,
- struct crypt_aead *caead,
- struct ucred *active_cred,
- struct thread *td)
+cryptodev_aead(struct csession *cse, struct crypt_aead *caead,
+ struct ucred *active_cred, struct thread *td)
{
struct cryptop_data *cod = NULL;
struct cryptop *crp = NULL;
@@ -1515,11 +1505,8 @@
/* ARGSUSED */
static int
-cryptof_stat(
- struct file *fp,
- struct stat *sb,
- struct ucred *active_cred,
- struct thread *td)
+cryptof_stat(struct file *fp, struct stat *sb, struct ucred *active_cred,
+ struct thread *td)
{
return (EOPNOTSUPP);
@@ -1545,7 +1532,8 @@
}
static int
-cryptof_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp)
+cryptof_fill_kinfo(struct file *fp, struct kinfo_file *kif,
+ struct filedesc *fdp)
{
kif->kf_type = KF_TYPE_CRYPTO;
@@ -1634,7 +1622,8 @@
}
static int
-cryptoioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td)
+cryptoioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag,
+ struct thread *td)
{
struct file *f;
struct fcrypt *fcr;

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 9, 12:05 AM (20 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16537404
Default Alt Text
D27066.diff (3 KB)

Event Timeline