diff options
-rw-r--r-- | src/lib/libcrypto/aes/aes_x86core.c | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/err/err.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/libcrypto/aes/aes_x86core.c b/src/lib/libcrypto/aes/aes_x86core.c index c604fa876f..d0d12dc3ae 100644 --- a/src/lib/libcrypto/aes/aes_x86core.c +++ b/src/lib/libcrypto/aes/aes_x86core.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: aes_x86core.c,v 1.8 2015/02/10 09:46:30 miod Exp $ */ | 1 | /* $OpenBSD: aes_x86core.c,v 1.9 2018/04/03 21:59:37 tb Exp $ */ |
2 | /** | 2 | /** |
3 | * rijndael-alg-fst.c | 3 | * rijndael-alg-fst.c |
4 | * | 4 | * |
@@ -465,7 +465,8 @@ static const u32 rcon[] = { | |||
465 | * Expand the cipher key into the encryption key schedule. | 465 | * Expand the cipher key into the encryption key schedule. |
466 | */ | 466 | */ |
467 | int | 467 | int |
468 | AES_set_encrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key) { | 468 | AES_set_encrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key) |
469 | { | ||
469 | u32 *rk; | 470 | u32 *rk; |
470 | int i = 0; | 471 | int i = 0; |
471 | u32 temp; | 472 | u32 temp; |
diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c index 320078da66..caabfe01d6 100644 --- a/src/lib/libcrypto/err/err.c +++ b/src/lib/libcrypto/err/err.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: err.c,v 1.46 2018/03/17 16:20:01 beck Exp $ */ | 1 | /* $OpenBSD: err.c,v 1.47 2018/04/03 21:59:37 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1107,7 +1107,8 @@ ERR_set_error_data(char *data, int flags) | |||
1107 | } | 1107 | } |
1108 | 1108 | ||
1109 | void | 1109 | void |
1110 | ERR_asprintf_error_data(char * format, ...) { | 1110 | ERR_asprintf_error_data(char * format, ...) |
1111 | { | ||
1111 | char *errbuf = NULL; | 1112 | char *errbuf = NULL; |
1112 | va_list ap; | 1113 | va_list ap; |
1113 | int r; | 1114 | int r; |