diff options
| author |   grunk <grunk@openbsd.org> | 2007-03-14 17:59:41 +0000 |
|---|---|---|
| committer | grunk <grunk@openbsd.org> | 2007-03-14 17:59:41 +0000 |
| commit | f6144d89fe0dbb6e5909c5cb7528d7930fd2853d (patch) | |
| tree | e82dcd3ed15a456cc85295b92c1a75a90c1f2054 | |
| parent | Clean up after miod. (diff) | |
| download | wireguard-openbsd-f6144d89fe0dbb6e5909c5cb7528d7930fd2853d.tar.xz wireguard-openbsd-f6144d89fe0dbb6e5909c5cb7528d7930fd2853d.zip | |
do the adjustment of arbitrary 128 -> BLF_MAXUTILIZED in userland as well,
also discussed on tech@ a while ago.
ok pedro@ tedu@ thib@
| -rw-r--r-- | include/blf.h | 3 | ||||
| -rw-r--r-- | usr.sbin/vnconfig/vnconfig.c | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/blf.h b/include/blf.h index 6c9085a6e6f..ec42b419401 100644 --- a/include/blf.h +++ b/include/blf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: blf.h,v 1.6 2002/02/16 21:27:17 millert Exp $ */ +/* $OpenBSD: blf.h,v 1.7 2007/03/14 17:59:41 grunk Exp $ */ /* * Blowfish - a fast block cipher designed by Bruce Schneier * @@ -43,6 +43,7 @@ #define BLF_N 16 /* Number of Subkeys */ #define BLF_MAXKEYLEN ((BLF_N-2)*4) /* 448 bits */ +#define BLF_MAXUTILIZED ((BLF_N+2)*4) /* 576 bits */ /* Blowfish context */ typedef struct BlowfishContext { diff --git a/usr.sbin/vnconfig/vnconfig.c b/usr.sbin/vnconfig/vnconfig.c index d2271458f28..f839c5d810c 100644 --- a/usr.sbin/vnconfig/vnconfig.c +++ b/usr.sbin/vnconfig/vnconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vnconfig.c,v 1.25 2007/02/23 11:00:02 grunk Exp $ */ +/* $OpenBSD: vnconfig.c,v 1.26 2007/03/14 17:59:41 grunk Exp $ */ /* * Copyright (c) 1993 University of Utah. * Copyright (c) 1990, 1993 @@ -44,6 +44,7 @@ #include <dev/vndioctl.h> +#include <blf.h> #include <err.h> #include <errno.h> #include <fcntl.h> @@ -135,7 +136,7 @@ main(int argc, char **argv) errx(1, "Need an encryption key"); } else if (opt_K) { key = get_pkcs_key(rounds, saltopt); - keylen = 128; + keylen = BLF_MAXUTILIZED; } rv = config(argv[0], argv[1], action, key, keylen); } else if (action == VND_UNCONFIG && argc == 1) @@ -207,8 +208,8 @@ get_pkcs_key(char *arg, char *saltopt) } else { memset(saltbuf, 0, sizeof(saltbuf)); } - if (pkcs5_pbkdf2((u_int8_t**)&key, 128, keybuf, sizeof(keybuf), - saltbuf, sizeof(saltbuf), rounds, 0)) + if (pkcs5_pbkdf2((u_int8_t**)&key, BLF_MAXUTILIZED, keybuf, + sizeof(keybuf), saltbuf, sizeof(saltbuf), rounds, 0)) errx(1, "pkcs5_pbkdf2 failed"); return (key); |