summaryrefslogtreecommitdiff
path: root/usr.bin/openssl
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2018-04-25 07:12:34 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2018-04-25 07:12:34 +0000
commitcea24fd3548c31ea169e3d33b5735fbdf150ce6b (patch)
treefcf59c2ec92ae407f0572a6f6fa215008f673959 /usr.bin/openssl
parentf9852403ee3e0260f03092f67dc3b6dfdcf2a276 (diff)
The cookie in the cookie verify callback needs to be const.
ok jsing (as part of a larger diff)
Diffstat (limited to 'usr.bin/openssl')
-rw-r--r--usr.bin/openssl/s_apps.h4
-rw-r--r--usr.bin/openssl/s_cb.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/openssl/s_apps.h b/usr.bin/openssl/s_apps.h
index ecadff5c010..9ee0bb7dc1c 100644
--- a/usr.bin/openssl/s_apps.h
+++ b/usr.bin/openssl/s_apps.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_apps.h,v 1.4 2016/12/30 17:25:48 jsing Exp $ */
+/* $OpenBSD: s_apps.h,v 1.5 2018/04/25 07:12:33 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -147,5 +147,5 @@ void tlsext_cb(SSL *s, int client_server, int type, unsigned char *data,
int generate_cookie_callback(SSL *ssl, unsigned char *cookie,
unsigned int *cookie_len);
-int verify_cookie_callback(SSL *ssl, unsigned char *cookie,
+int verify_cookie_callback(SSL *ssl, const unsigned char *cookie,
unsigned int cookie_len);
diff --git a/usr.bin/openssl/s_cb.c b/usr.bin/openssl/s_cb.c
index b25118c0300..835e99551b3 100644
--- a/usr.bin/openssl/s_cb.c
+++ b/usr.bin/openssl/s_cb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_cb.c,v 1.9 2018/01/15 11:02:07 inoguchi Exp $ */
+/* $OpenBSD: s_cb.c,v 1.10 2018/04/25 07:12:33 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -821,7 +821,8 @@ generate_cookie_callback(SSL * ssl, unsigned char *cookie,
}
int
-verify_cookie_callback(SSL * ssl, unsigned char *cookie, unsigned int cookie_len)
+verify_cookie_callback(SSL * ssl, const unsigned char *cookie,
+ unsigned int cookie_len)
{
unsigned char *buffer, result[EVP_MAX_MD_SIZE];
unsigned int length, resultlength;