summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/libcrypto/aes/aes_x86core.c5
-rw-r--r--lib/libcrypto/err/err.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/libcrypto/aes/aes_x86core.c b/lib/libcrypto/aes/aes_x86core.c
index c604fa876f4..d0d12dc3ae7 100644
--- a/lib/libcrypto/aes/aes_x86core.c
+++ b/lib/libcrypto/aes/aes_x86core.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aes_x86core.c,v 1.8 2015/02/10 09:46:30 miod Exp $ */
+/* $OpenBSD: aes_x86core.c,v 1.9 2018/04/03 21:59:37 tb Exp $ */
/**
* rijndael-alg-fst.c
*
@@ -465,7 +465,8 @@ static const u32 rcon[] = {
* Expand the cipher key into the encryption key schedule.
*/
int
-AES_set_encrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key) {
+AES_set_encrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key)
+{
u32 *rk;
int i = 0;
u32 temp;
diff --git a/lib/libcrypto/err/err.c b/lib/libcrypto/err/err.c
index 320078da664..caabfe01d6e 100644
--- a/lib/libcrypto/err/err.c
+++ b/lib/libcrypto/err/err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: err.c,v 1.46 2018/03/17 16:20:01 beck Exp $ */
+/* $OpenBSD: err.c,v 1.47 2018/04/03 21:59:37 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -1107,7 +1107,8 @@ ERR_set_error_data(char *data, int flags)
}
void
-ERR_asprintf_error_data(char * format, ...) {
+ERR_asprintf_error_data(char * format, ...)
+{
char *errbuf = NULL;
va_list ap;
int r;