diff options
| author | tb <> | 2018-04-25 07:12:33 +0000 |
|---|---|---|
| committer | tb <> | 2018-04-25 07:12:33 +0000 |
| commit | 6e1f0836ed5f34d217acbaba9981a1dbcc400844 (patch) | |
| tree | 38b8da3b6f1e041c31eca613937f7e4fc93f258c /src | |
| parent | 7a58116b9a7e5669a2dd3926f53fafdaa1d8ec1e (diff) | |
| download | openbsd-6e1f0836ed5f34d217acbaba9981a1dbcc400844.tar.gz openbsd-6e1f0836ed5f34d217acbaba9981a1dbcc400844.tar.bz2 openbsd-6e1f0836ed5f34d217acbaba9981a1dbcc400844.zip | |
The cookie in the cookie verify callback needs to be const.
ok jsing (as part of a larger diff)
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr.bin/openssl/s_apps.h | 4 | ||||
| -rw-r--r-- | src/usr.bin/openssl/s_cb.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/usr.bin/openssl/s_apps.h b/src/usr.bin/openssl/s_apps.h index ecadff5c01..9ee0bb7dc1 100644 --- a/src/usr.bin/openssl/s_apps.h +++ b/src/usr.bin/openssl/s_apps.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s_apps.h,v 1.4 2016/12/30 17:25:48 jsing Exp $ */ | 1 | /* $OpenBSD: s_apps.h,v 1.5 2018/04/25 07:12:33 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 | * |
| @@ -147,5 +147,5 @@ void tlsext_cb(SSL *s, int client_server, int type, unsigned char *data, | |||
| 147 | 147 | ||
| 148 | int generate_cookie_callback(SSL *ssl, unsigned char *cookie, | 148 | int generate_cookie_callback(SSL *ssl, unsigned char *cookie, |
| 149 | unsigned int *cookie_len); | 149 | unsigned int *cookie_len); |
| 150 | int verify_cookie_callback(SSL *ssl, unsigned char *cookie, | 150 | int verify_cookie_callback(SSL *ssl, const unsigned char *cookie, |
| 151 | unsigned int cookie_len); | 151 | unsigned int cookie_len); |
diff --git a/src/usr.bin/openssl/s_cb.c b/src/usr.bin/openssl/s_cb.c index b25118c030..835e99551b 100644 --- a/src/usr.bin/openssl/s_cb.c +++ b/src/usr.bin/openssl/s_cb.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s_cb.c,v 1.9 2018/01/15 11:02:07 inoguchi Exp $ */ | 1 | /* $OpenBSD: s_cb.c,v 1.10 2018/04/25 07:12:33 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 | * |
| @@ -821,7 +821,8 @@ generate_cookie_callback(SSL * ssl, unsigned char *cookie, | |||
| 821 | } | 821 | } |
| 822 | 822 | ||
| 823 | int | 823 | int |
| 824 | verify_cookie_callback(SSL * ssl, unsigned char *cookie, unsigned int cookie_len) | 824 | verify_cookie_callback(SSL * ssl, const unsigned char *cookie, |
| 825 | unsigned int cookie_len) | ||
| 825 | { | 826 | { |
| 826 | unsigned char *buffer, result[EVP_MAX_MD_SIZE]; | 827 | unsigned char *buffer, result[EVP_MAX_MD_SIZE]; |
| 827 | unsigned int length, resultlength; | 828 | unsigned int length, resultlength; |