diff options
author | jsing <> | 2020-05-10 14:17:48 +0000 |
---|---|---|
committer | jsing <> | 2020-05-10 14:17:48 +0000 |
commit | 2c5bb57394ae3bd0d749e60f9e5489396e6f7d75 (patch) | |
tree | b66a408927dda1a4853152273bf1767b1576d8e2 /src/lib/libssl/ssl_clnt.c | |
parent | 460f8be5c360d203bab35f98b05092261d9701b0 (diff) | |
download | openbsd-2c5bb57394ae3bd0d749e60f9e5489396e6f7d75.tar.gz openbsd-2c5bb57394ae3bd0d749e60f9e5489396e6f7d75.tar.bz2 openbsd-2c5bb57394ae3bd0d749e60f9e5489396e6f7d75.zip |
Use size_t for OCSP response length.
The OCSP response length is currently an integer, which is overloaded with
-1 meaning "unset". Use a size_t for the OCSP response length and infer
unset from the OCSP response being NULL. This makes code more readable,
simpler and less error prone.
ok beck@
Diffstat (limited to 'src/lib/libssl/ssl_clnt.c')
-rw-r--r-- | src/lib/libssl/ssl_clnt.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c index a83453d39c..6b457569a3 100644 --- a/src/lib/libssl/ssl_clnt.c +++ b/src/lib/libssl/ssl_clnt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_clnt.c,v 1.65 2020/05/09 13:54:19 tb Exp $ */ | 1 | /* $OpenBSD: ssl_clnt.c,v 1.66 2020/05/10 14:17:47 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 | * |
@@ -1830,7 +1830,6 @@ int | |||
1830 | ssl3_get_cert_status(SSL *s) | 1830 | ssl3_get_cert_status(SSL *s) |
1831 | { | 1831 | { |
1832 | CBS cert_status, response; | 1832 | CBS cert_status, response; |
1833 | size_t stow_len; | ||
1834 | int ok, al; | 1833 | int ok, al; |
1835 | long n; | 1834 | long n; |
1836 | uint8_t status_type; | 1835 | uint8_t status_type; |
@@ -1871,13 +1870,11 @@ ssl3_get_cert_status(SSL *s) | |||
1871 | } | 1870 | } |
1872 | 1871 | ||
1873 | if (!CBS_stow(&response, &s->internal->tlsext_ocsp_resp, | 1872 | if (!CBS_stow(&response, &s->internal->tlsext_ocsp_resp, |
1874 | &stow_len) || stow_len > INT_MAX) { | 1873 | &s->internal->tlsext_ocsp_resp_len)) { |
1875 | s->internal->tlsext_ocsp_resplen = 0; | ||
1876 | al = SSL_AD_INTERNAL_ERROR; | 1874 | al = SSL_AD_INTERNAL_ERROR; |
1877 | SSLerror(s, ERR_R_MALLOC_FAILURE); | 1875 | SSLerror(s, ERR_R_MALLOC_FAILURE); |
1878 | goto f_err; | 1876 | goto f_err; |
1879 | } | 1877 | } |
1880 | s->internal->tlsext_ocsp_resplen = (int)stow_len; | ||
1881 | 1878 | ||
1882 | if (s->ctx->internal->tlsext_status_cb) { | 1879 | if (s->ctx->internal->tlsext_status_cb) { |
1883 | int ret; | 1880 | int ret; |