summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r--src/lib/libssl/ssl.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 143dd8a003..f996af188f 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.155 2018/04/11 17:47:36 jsing Exp $ */ 1/* $OpenBSD: ssl.h,v 1.156 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 *
@@ -727,10 +727,10 @@ void SSL_CTX_sess_set_remove_cb(SSL_CTX *ctx,
727void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx))(struct ssl_ctx_st *ctx, 727void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx))(struct ssl_ctx_st *ctx,
728 SSL_SESSION *sess); 728 SSL_SESSION *sess);
729void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx, 729void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx,
730 SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl, unsigned char *data, 730 SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl,
731 int len, int *copy)); 731 const unsigned char *data, int len, int *copy));
732SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(struct ssl_st *ssl, 732SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(struct ssl_st *ssl,
733 unsigned char *Data, int len, int *copy); 733 const unsigned char *Data, int len, int *copy);
734void SSL_CTX_set_info_callback(SSL_CTX *ctx, void (*cb)(const SSL *ssl, 734void SSL_CTX_set_info_callback(SSL_CTX *ctx, void (*cb)(const SSL *ssl,
735 int type, int val)); 735 int type, int val));
736void (*SSL_CTX_get_info_callback(SSL_CTX *ctx))(const SSL *ssl, int type, 736void (*SSL_CTX_get_info_callback(SSL_CTX *ctx))(const SSL *ssl, int type,
@@ -746,7 +746,7 @@ void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx,
746 int (*app_gen_cookie_cb)(SSL *ssl, unsigned char *cookie, 746 int (*app_gen_cookie_cb)(SSL *ssl, unsigned char *cookie,
747 unsigned int *cookie_len)); 747 unsigned int *cookie_len));
748void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx, 748void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx,
749 int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie, 749 int (*app_verify_cookie_cb)(SSL *ssl, const unsigned char *cookie,
750 unsigned int cookie_len)); 750 unsigned int cookie_len));
751void SSL_CTX_set_next_protos_advertised_cb(SSL_CTX *s, int (*cb)(SSL *ssl, 751void SSL_CTX_set_next_protos_advertised_cb(SSL_CTX *s, int (*cb)(SSL *ssl,
752 const unsigned char **out, unsigned int *outlen, void *arg), void *arg); 752 const unsigned char **out, unsigned int *outlen, void *arg), void *arg);
@@ -1247,7 +1247,7 @@ const SSL_CIPHER *SSL_get_current_cipher(const SSL *s);
1247const SSL_CIPHER *SSL_CIPHER_get_by_id(unsigned int id); 1247const SSL_CIPHER *SSL_CIPHER_get_by_id(unsigned int id);
1248const SSL_CIPHER *SSL_CIPHER_get_by_value(uint16_t value); 1248const SSL_CIPHER *SSL_CIPHER_get_by_value(uint16_t value);
1249int SSL_CIPHER_get_bits(const SSL_CIPHER *c, int *alg_bits); 1249int SSL_CIPHER_get_bits(const SSL_CIPHER *c, int *alg_bits);
1250char * SSL_CIPHER_get_version(const SSL_CIPHER *c); 1250const char * SSL_CIPHER_get_version(const SSL_CIPHER *c);
1251const char * SSL_CIPHER_get_name(const SSL_CIPHER *c); 1251const char * SSL_CIPHER_get_name(const SSL_CIPHER *c);
1252unsigned long SSL_CIPHER_get_id(const SSL_CIPHER *c); 1252unsigned long SSL_CIPHER_get_id(const SSL_CIPHER *c);
1253uint16_t SSL_CIPHER_get_value(const SSL_CIPHER *c); 1253uint16_t SSL_CIPHER_get_value(const SSL_CIPHER *c);
@@ -1279,7 +1279,7 @@ void SSL_set_verify(SSL *s, int mode,
1279 int (*callback)(int ok, X509_STORE_CTX *ctx)); 1279 int (*callback)(int ok, X509_STORE_CTX *ctx));
1280void SSL_set_verify_depth(SSL *s, int depth); 1280void SSL_set_verify_depth(SSL *s, int depth);
1281int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa); 1281int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa);
1282int SSL_use_RSAPrivateKey_ASN1(SSL *ssl, unsigned char *d, long len); 1282int SSL_use_RSAPrivateKey_ASN1(SSL *ssl, const unsigned char *d, long len);
1283int SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey); 1283int SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey);
1284int SSL_use_PrivateKey_ASN1(int pk, SSL *ssl, const unsigned char *d, long len); 1284int SSL_use_PrivateKey_ASN1(int pk, SSL *ssl, const unsigned char *d, long len);
1285int SSL_use_certificate(SSL *ssl, X509 *x); 1285int SSL_use_certificate(SSL *ssl, X509 *x);
@@ -1457,12 +1457,12 @@ long SSL_get_default_timeout(const SSL *s);
1457int SSL_library_init(void ); 1457int SSL_library_init(void );
1458 1458
1459char *SSL_CIPHER_description(const SSL_CIPHER *, char *buf, int size); 1459char *SSL_CIPHER_description(const SSL_CIPHER *, char *buf, int size);
1460STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk); 1460STACK_OF(X509_NAME) *SSL_dup_CA_list(const STACK_OF(X509_NAME) *sk);
1461 1461
1462SSL *SSL_dup(SSL *ssl); 1462SSL *SSL_dup(SSL *ssl);
1463 1463
1464X509 *SSL_get_certificate(const SSL *ssl); 1464X509 *SSL_get_certificate(const SSL *ssl);
1465/* EVP_PKEY */ struct evp_pkey_st *SSL_get_privatekey(SSL *ssl); 1465/* EVP_PKEY */ struct evp_pkey_st *SSL_get_privatekey(const SSL *ssl);
1466 1466
1467void SSL_CTX_set_quiet_shutdown(SSL_CTX *ctx,int mode); 1467void SSL_CTX_set_quiet_shutdown(SSL_CTX *ctx,int mode);
1468int SSL_CTX_get_quiet_shutdown(const SSL_CTX *ctx); 1468int SSL_CTX_get_quiet_shutdown(const SSL_CTX *ctx);