diff options
| author | jsing <> | 2021-07-01 17:53:39 +0000 |
|---|---|---|
| committer | jsing <> | 2021-07-01 17:53:39 +0000 |
| commit | 909a6d9c0830e04a252ab680efffd5246ba048ba (patch) | |
| tree | 57d97f559edf3211313bbaee593ec7483ded13e4 /src/lib/libssl/t1_lib.c | |
| parent | add9d0d8d906ecd375af373d3858c43e0f44be41 (diff) | |
| download | openbsd-909a6d9c0830e04a252ab680efffd5246ba048ba.tar.gz openbsd-909a6d9c0830e04a252ab680efffd5246ba048ba.tar.bz2 openbsd-909a6d9c0830e04a252ab680efffd5246ba048ba.zip | |
Merge SSL_METHOD_INTERNAL into SSL_METHOD.
Now that SSL_METHOD is opaque and in internal headers, we can remove
SSL_METHOD_INTERNAL by merging it back into SSL_METHOD.
ok tb@
Diffstat (limited to 'src/lib/libssl/t1_lib.c')
| -rw-r--r-- | src/lib/libssl/t1_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index 72958b7c56..3cb2d8a113 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: t1_lib.c,v 1.181 2021/06/11 11:13:53 jsing Exp $ */ | 1 | /* $OpenBSD: t1_lib.c,v 1.182 2021/07/01 17:53:39 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 | * |
| @@ -129,7 +129,7 @@ tls1_new(SSL *s) | |||
| 129 | { | 129 | { |
| 130 | if (!ssl3_new(s)) | 130 | if (!ssl3_new(s)) |
| 131 | return (0); | 131 | return (0); |
| 132 | s->method->internal->ssl_clear(s); | 132 | s->method->ssl_clear(s); |
| 133 | return (1); | 133 | return (1); |
| 134 | } | 134 | } |
| 135 | 135 | ||
| @@ -147,7 +147,7 @@ void | |||
| 147 | tls1_clear(SSL *s) | 147 | tls1_clear(SSL *s) |
| 148 | { | 148 | { |
| 149 | ssl3_clear(s); | 149 | ssl3_clear(s); |
| 150 | s->version = s->method->internal->version; | 150 | s->version = s->method->version; |
| 151 | } | 151 | } |
| 152 | 152 | ||
| 153 | static const int nid_list[] = { | 153 | static const int nid_list[] = { |
