diff options
| author |   jsing <jsing@openbsd.org> | 2017-01-23 13:36:12 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2017-01-23 13:36:12 +0000 |
| commit | 9eac7899ed76d83aff808c8376c1d53fc748541a (patch) | |
| tree | 571d929db113cf5cd0463ab8d85cada655a140f1 /lib/libssl/s3_lib.c | |
| parent | _end should be on a 64-bit boundary, so make sure to align (diff) | |
| download | wireguard-openbsd-9eac7899ed76d83aff808c8376c1d53fc748541a.tar.xz wireguard-openbsd-9eac7899ed76d83aff808c8376c1d53fc748541a.zip | |
Split most of SSL_METHOD out into an internal variant, which is opaque.
Discussed with beck@
Diffstat (limited to 'lib/libssl/s3_lib.c')
| -rw-r--r-- | lib/libssl/s3_lib.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/libssl/s3_lib.c b/lib/libssl/s3_lib.c index 09af18ea957..a42ac73335a 100644 --- a/lib/libssl/s3_lib.c +++ b/lib/libssl/s3_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_lib.c,v 1.126 2017/01/23 08:48:44 beck Exp $ */ +/* $OpenBSD: s3_lib.c,v 1.127 2017/01/23 13:36:13 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1816,7 +1816,7 @@ ssl3_new(SSL *s) return (0); } - s->method->ssl_clear(s); + s->method->internal->ssl_clear(s); return (1); } @@ -2533,7 +2533,7 @@ ssl3_shutdown(SSL *s) } } else if (!(s->internal->shutdown & SSL_RECEIVED_SHUTDOWN)) { /* If we are waiting for a close from our peer, we are closed */ - s->method->ssl_read_bytes(s, 0, NULL, 0, 0); + s->method->internal->ssl_read_bytes(s, 0, NULL, 0, 0); if (!(s->internal->shutdown & SSL_RECEIVED_SHUTDOWN)) { return(-1); /* return WANT_READ */ } @@ -2592,8 +2592,8 @@ ssl3_write(SSL *s, const void *buf, int len) ret = S3I(s)->delay_buf_pop_ret; S3I(s)->delay_buf_pop_ret = 0; } else { - ret = s->method->ssl_write_bytes(s, SSL3_RT_APPLICATION_DATA, - buf, len); + ret = s->method->internal->ssl_write_bytes(s, + SSL3_RT_APPLICATION_DATA, buf, len); if (ret <= 0) return (ret); } @@ -2610,7 +2610,7 @@ ssl3_read_internal(SSL *s, void *buf, int len, int peek) if (S3I(s)->renegotiate) ssl3_renegotiate_check(s); S3I(s)->in_read_app_data = 1; - ret = s->method->ssl_read_bytes(s, + ret = s->method->internal->ssl_read_bytes(s, SSL3_RT_APPLICATION_DATA, buf, len, peek); if ((ret == -1) && (S3I(s)->in_read_app_data == 2)) { /* @@ -2621,7 +2621,7 @@ ssl3_read_internal(SSL *s, void *buf, int len, int peek) * handshake processing and try to read application data again. */ s->internal->in_handshake++; - ret = s->method->ssl_read_bytes(s, + ret = s->method->internal->ssl_read_bytes(s, SSL3_RT_APPLICATION_DATA, buf, len, peek); s->internal->in_handshake--; } else @@ -2687,7 +2687,7 @@ ssl_get_algorithm2(SSL *s) { long alg2 = S3I(s)->tmp.new_cipher->algorithm2; - if (s->method->ssl3_enc->enc_flags & SSL_ENC_FLAG_SHA256_PRF && + if (s->method->internal->ssl3_enc->enc_flags & SSL_ENC_FLAG_SHA256_PRF && alg2 == (SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF)) return SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256; return alg2; |