From cea24fd3548c31ea169e3d33b5735fbdf150ce6b Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Wed, 25 Apr 2018 07:12:34 +0000 Subject: The cookie in the cookie verify callback needs to be const. ok jsing (as part of a larger diff) --- usr.bin/openssl/s_apps.h | 4 ++-- usr.bin/openssl/s_cb.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'usr.bin/openssl') 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; -- cgit v1.2.3