diff options
Diffstat (limited to 'src/lib/libssl/ssl_srvr.c')
-rw-r--r-- | src/lib/libssl/ssl_srvr.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c index 26b24f4f22..6b49afe6a8 100644 --- a/src/lib/libssl/ssl_srvr.c +++ b/src/lib/libssl/ssl_srvr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_srvr.c,v 1.69 2020/01/23 08:04:50 beck Exp $ */ | 1 | /* $OpenBSD: ssl_srvr.c,v 1.70 2020/01/23 10:48:37 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 | * |
@@ -815,7 +815,7 @@ ssl3_get_client_hello(SSL *s) | |||
815 | } | 815 | } |
816 | 816 | ||
817 | s->internal->first_packet = 1; | 817 | s->internal->first_packet = 1; |
818 | n = s->method->internal->ssl_get_message(s, SSL3_ST_SR_CLNT_HELLO_B, | 818 | n = ssl3_get_message(s, SSL3_ST_SR_CLNT_HELLO_B, |
819 | SSL3_ST_SR_CLNT_HELLO_C, SSL3_MT_CLIENT_HELLO, | 819 | SSL3_ST_SR_CLNT_HELLO_C, SSL3_MT_CLIENT_HELLO, |
820 | SSL3_RT_MAX_PLAIN_LENGTH, &ok); | 820 | SSL3_RT_MAX_PLAIN_LENGTH, &ok); |
821 | if (!ok) | 821 | if (!ok) |
@@ -2060,7 +2060,7 @@ ssl3_get_client_key_exchange(SSL *s) | |||
2060 | long n; | 2060 | long n; |
2061 | 2061 | ||
2062 | /* 2048 maxlen is a guess. How long a key does that permit? */ | 2062 | /* 2048 maxlen is a guess. How long a key does that permit? */ |
2063 | n = s->method->internal->ssl_get_message(s, SSL3_ST_SR_KEY_EXCH_A, | 2063 | n = ssl3_get_message(s, SSL3_ST_SR_KEY_EXCH_A, |
2064 | SSL3_ST_SR_KEY_EXCH_B, SSL3_MT_CLIENT_KEY_EXCHANGE, 2048, &ok); | 2064 | SSL3_ST_SR_KEY_EXCH_B, SSL3_MT_CLIENT_KEY_EXCHANGE, 2048, &ok); |
2065 | if (!ok) | 2065 | if (!ok) |
2066 | return ((int)n); | 2066 | return ((int)n); |
@@ -2122,7 +2122,7 @@ ssl3_get_cert_verify(SSL *s) | |||
2122 | 2122 | ||
2123 | EVP_MD_CTX_init(&mctx); | 2123 | EVP_MD_CTX_init(&mctx); |
2124 | 2124 | ||
2125 | n = s->method->internal->ssl_get_message(s, SSL3_ST_SR_CERT_VRFY_A, | 2125 | n = ssl3_get_message(s, SSL3_ST_SR_CERT_VRFY_A, |
2126 | SSL3_ST_SR_CERT_VRFY_B, -1, SSL3_RT_MAX_PLAIN_LENGTH, &ok); | 2126 | SSL3_ST_SR_CERT_VRFY_B, -1, SSL3_RT_MAX_PLAIN_LENGTH, &ok); |
2127 | if (!ok) | 2127 | if (!ok) |
2128 | return ((int)n); | 2128 | return ((int)n); |
@@ -2345,9 +2345,8 @@ ssl3_get_client_certificate(SSL *s) | |||
2345 | const unsigned char *q; | 2345 | const unsigned char *q; |
2346 | STACK_OF(X509) *sk = NULL; | 2346 | STACK_OF(X509) *sk = NULL; |
2347 | 2347 | ||
2348 | n = s->method->internal->ssl_get_message(s, SSL3_ST_SR_CERT_A, SSL3_ST_SR_CERT_B, | 2348 | n = ssl3_get_message(s, SSL3_ST_SR_CERT_A, SSL3_ST_SR_CERT_B, |
2349 | -1, s->internal->max_cert_list, &ok); | 2349 | -1, s->internal->max_cert_list, &ok); |
2350 | |||
2351 | if (!ok) | 2350 | if (!ok) |
2352 | return ((int)n); | 2351 | return ((int)n); |
2353 | 2352 | ||