diff options
author | tb <> | 2018-04-25 07:10:39 +0000 |
---|---|---|
committer | tb <> | 2018-04-25 07:10:39 +0000 |
commit | 7a58116b9a7e5669a2dd3926f53fafdaa1d8ec1e (patch) | |
tree | af0d93a255d15bc29d3b427a91bfc08513163ac5 /src/lib/libssl/ssl_locl.h | |
parent | 1050fac1647b143f03ecfdf7cf1a88d71cf4d1c2 (diff) | |
download | openbsd-7a58116b9a7e5669a2dd3926f53fafdaa1d8ec1e.tar.gz openbsd-7a58116b9a7e5669a2dd3926f53fafdaa1d8ec1e.tar.bz2 openbsd-7a58116b9a7e5669a2dd3926f53fafdaa1d8ec1e.zip |
OpenSSL started adding const to functions all over the place. Make all
our libssl functions match theirs wrt const, except for BIO_f_ssl(3)
which will be fixed in a later step.
this went through a i386 bulk by sthen
ok jsing
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 1677377c64..696ffc44b9 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.204 2018/04/07 17:02:34 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.205 2018/04/25 07:10:39 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 | * |
@@ -460,7 +460,7 @@ typedef struct ssl_ctx_internal_st { | |||
460 | int (*new_session_cb)(struct ssl_st *ssl, SSL_SESSION *sess); | 460 | int (*new_session_cb)(struct ssl_st *ssl, SSL_SESSION *sess); |
461 | void (*remove_session_cb)(struct ssl_ctx_st *ctx, SSL_SESSION *sess); | 461 | void (*remove_session_cb)(struct ssl_ctx_st *ctx, SSL_SESSION *sess); |
462 | SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl, | 462 | SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl, |
463 | unsigned char *data, int len, int *copy); | 463 | const unsigned char *data, int len, int *copy); |
464 | 464 | ||
465 | /* if defined, these override the X509_verify_cert() calls */ | 465 | /* if defined, these override the X509_verify_cert() calls */ |
466 | int (*app_verify_callback)(X509_STORE_CTX *, void *); | 466 | int (*app_verify_callback)(X509_STORE_CTX *, void *); |
@@ -474,7 +474,7 @@ typedef struct ssl_ctx_internal_st { | |||
474 | unsigned int *cookie_len); | 474 | unsigned int *cookie_len); |
475 | 475 | ||
476 | /* verify cookie callback */ | 476 | /* verify cookie callback */ |
477 | int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie, | 477 | int (*app_verify_cookie_cb)(SSL *ssl, const unsigned char *cookie, |
478 | unsigned int cookie_len); | 478 | unsigned int cookie_len); |
479 | 479 | ||
480 | void (*info_callback)(const SSL *ssl,int type,int val); /* used if SSL's info_callback is NULL */ | 480 | void (*info_callback)(const SSL *ssl,int type,int val); /* used if SSL's info_callback is NULL */ |