summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/src/ssl/ssl.h10
-rw-r--r--src/lib/libssl/ssl.h10
2 files changed, 6 insertions, 14 deletions
diff --git a/src/lib/libssl/src/ssl/ssl.h b/src/lib/libssl/src/ssl/ssl.h
index 99271b5cb6..ea4bc198ea 100644
--- a/src/lib/libssl/src/ssl/ssl.h
+++ b/src/lib/libssl/src/ssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.84 2015/06/17 06:49:27 doug Exp $ */ 1/* $OpenBSD: ssl.h,v 1.85 2015/06/17 14:14:20 jsing 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 *
@@ -382,7 +382,6 @@ struct ssl_cipher_st {
382 const char *name; /* text name */ 382 const char *name; /* text name */
383 unsigned long id; /* id, 4 bytes, first is version */ 383 unsigned long id; /* id, 4 bytes, first is version */
384 384
385 /* changed in 0.9.9: these four used to be portions of a single value 'algorithms' */
386 unsigned long algorithm_mkey; /* key exchange algorithm */ 385 unsigned long algorithm_mkey; /* key exchange algorithm */
387 unsigned long algorithm_auth; /* server authentication */ 386 unsigned long algorithm_auth; /* server authentication */
388 unsigned long algorithm_enc; /* symmetric encryption */ 387 unsigned long algorithm_enc; /* symmetric encryption */
@@ -532,7 +531,7 @@ struct ssl_session_st {
532 * at all, which is why it was previously included in SSL_OP_ALL. 531 * at all, which is why it was previously included in SSL_OP_ALL.
533 * Now it's not. 532 * Now it's not.
534 */ 533 */
535#define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS 0x00000800L /* added in 0.9.6e */ 534#define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS 0x00000800L
536 535
537/* DTLS options */ 536/* DTLS options */
538#define SSL_OP_NO_QUERY_MTU 0x00001000L 537#define SSL_OP_NO_QUERY_MTU 0x00001000L
@@ -572,8 +571,7 @@ struct ssl_session_st {
572 */ 571 */
573#define SSL_OP_CRYPTOPRO_TLSEXT_BUG 0x80000000L 572#define SSL_OP_CRYPTOPRO_TLSEXT_BUG 0x80000000L
574 573
575/* SSL_OP_ALL: various bug workarounds that should be rather harmless. 574/* SSL_OP_ALL: various bug workarounds that should be rather harmless. */
576 * This used to be 0x000FFFFFL before 0.9.7. */
577#define SSL_OP_ALL 0x80000374L 575#define SSL_OP_ALL 0x80000374L
578 576
579/* Obsolete flags kept for compatibility. No sane code should use them. */ 577/* Obsolete flags kept for compatibility. No sane code should use them. */
@@ -749,8 +747,6 @@ struct ssl_ctx_st {
749 /* if defined, these override the X509_verify_cert() calls */ 747 /* if defined, these override the X509_verify_cert() calls */
750 int (*app_verify_callback)(X509_STORE_CTX *, void *); 748 int (*app_verify_callback)(X509_STORE_CTX *, void *);
751 void *app_verify_arg; 749 void *app_verify_arg;
752 /* before OpenSSL 0.9.7, 'app_verify_arg' was ignored
753 * ('app_verify_callback' was called with just one argument) */
754 750
755 /* Default password callback. */ 751 /* Default password callback. */
756 pem_password_cb *default_passwd_callback; 752 pem_password_cb *default_passwd_callback;
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 99271b5cb6..ea4bc198ea 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.84 2015/06/17 06:49:27 doug Exp $ */ 1/* $OpenBSD: ssl.h,v 1.85 2015/06/17 14:14:20 jsing 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 *
@@ -382,7 +382,6 @@ struct ssl_cipher_st {
382 const char *name; /* text name */ 382 const char *name; /* text name */
383 unsigned long id; /* id, 4 bytes, first is version */ 383 unsigned long id; /* id, 4 bytes, first is version */
384 384
385 /* changed in 0.9.9: these four used to be portions of a single value 'algorithms' */
386 unsigned long algorithm_mkey; /* key exchange algorithm */ 385 unsigned long algorithm_mkey; /* key exchange algorithm */
387 unsigned long algorithm_auth; /* server authentication */ 386 unsigned long algorithm_auth; /* server authentication */
388 unsigned long algorithm_enc; /* symmetric encryption */ 387 unsigned long algorithm_enc; /* symmetric encryption */
@@ -532,7 +531,7 @@ struct ssl_session_st {
532 * at all, which is why it was previously included in SSL_OP_ALL. 531 * at all, which is why it was previously included in SSL_OP_ALL.
533 * Now it's not. 532 * Now it's not.
534 */ 533 */
535#define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS 0x00000800L /* added in 0.9.6e */ 534#define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS 0x00000800L
536 535
537/* DTLS options */ 536/* DTLS options */
538#define SSL_OP_NO_QUERY_MTU 0x00001000L 537#define SSL_OP_NO_QUERY_MTU 0x00001000L
@@ -572,8 +571,7 @@ struct ssl_session_st {
572 */ 571 */
573#define SSL_OP_CRYPTOPRO_TLSEXT_BUG 0x80000000L 572#define SSL_OP_CRYPTOPRO_TLSEXT_BUG 0x80000000L
574 573
575/* SSL_OP_ALL: various bug workarounds that should be rather harmless. 574/* SSL_OP_ALL: various bug workarounds that should be rather harmless. */
576 * This used to be 0x000FFFFFL before 0.9.7. */
577#define SSL_OP_ALL 0x80000374L 575#define SSL_OP_ALL 0x80000374L
578 576
579/* Obsolete flags kept for compatibility. No sane code should use them. */ 577/* Obsolete flags kept for compatibility. No sane code should use them. */
@@ -749,8 +747,6 @@ struct ssl_ctx_st {
749 /* if defined, these override the X509_verify_cert() calls */ 747 /* if defined, these override the X509_verify_cert() calls */
750 int (*app_verify_callback)(X509_STORE_CTX *, void *); 748 int (*app_verify_callback)(X509_STORE_CTX *, void *);
751 void *app_verify_arg; 749 void *app_verify_arg;
752 /* before OpenSSL 0.9.7, 'app_verify_arg' was ignored
753 * ('app_verify_callback' was called with just one argument) */
754 750
755 /* Default password callback. */ 751 /* Default password callback. */
756 pem_password_cb *default_passwd_callback; 752 pem_password_cb *default_passwd_callback;
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 23:30:57 +0000