diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2017-01-22 04:07:45 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2017-01-22 04:07:45 +0000 |
| commit | 48bb4f44254a37084dae09a6a2f1110c79ed539a (patch) | |
| tree | c8fd32ab8a3cf155e6c3b6d58430f4c24b38dd59 | |
| parent | 95f32f080a9564574a6235b520f7f81bc76dc0e5 (diff) | |
Move recently added min_version/max_version from SSL and SSL_CTX to their
opaque structs.
| -rw-r--r-- | lib/libssl/ssl.h | 8 | ||||
| -rw-r--r-- | lib/libssl/ssl_locl.h | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h index e8ad9fb4704..c8be3db253e 100644 --- a/lib/libssl/ssl.h +++ b/lib/libssl/ssl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.h,v 1.103 2017/01/22 03:50:45 jsing Exp $ */ +/* $OpenBSD: ssl.h,v 1.104 2017/01/22 04:07:44 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -697,9 +697,6 @@ struct ssl_ctx_internal_st; struct ssl_ctx_st { const SSL_METHOD *method; - uint16_t min_version; - uint16_t max_version; - STACK_OF(SSL_CIPHER) *cipher_list; /* same as above but sorted for lookup */ STACK_OF(SSL_CIPHER) *cipher_list_by_id; @@ -1014,9 +1011,6 @@ struct ssl_st { */ int version; - uint16_t min_version; - uint16_t max_version; - int type; /* SSL_ST_CONNECT or SSL_ST_ACCEPT */ const SSL_METHOD *method; /* SSLv3 */ diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h index 50f527aad51..ab18ae1c830 100644 --- a/lib/libssl/ssl_locl.h +++ b/lib/libssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.146 2017/01/22 03:50:45 jsing Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.147 2017/01/22 04:07:44 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -377,11 +377,13 @@ typedef struct ssl_session_internal_st { } SSL_SESSION_INTERNAL; typedef struct ssl_ctx_internal_st { - + uint16_t min_version; + uint16_t max_version; } SSL_CTX_INTERNAL; typedef struct ssl_internal_st { - + uint16_t min_version; + uint16_t max_version; } SSL_INTERNAL; typedef struct ssl3_state_internal_st { |