diff options
| author | tb <> | 2020-01-22 10:38:11 +0000 |
|---|---|---|
| committer | tb <> | 2020-01-22 10:38:11 +0000 |
| commit | 5240aa6125e7c578cc9cf9bbe7b2ba9b97c7a19d (patch) | |
| tree | 812ed0529dff664d672ea82deda97573c056043e | |
| parent | 09b0277c2277bf29ce293525668c84828f20142a (diff) | |
| download | openbsd-5240aa6125e7c578cc9cf9bbe7b2ba9b97c7a19d.tar.gz openbsd-5240aa6125e7c578cc9cf9bbe7b2ba9b97c7a19d.tar.bz2 openbsd-5240aa6125e7c578cc9cf9bbe7b2ba9b97c7a19d.zip | |
Rename failure into alert_desc in tlsext_ocsp_server_parse().
| -rw-r--r-- | src/lib/libssl/ssl_tlsext.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_tlsext.c b/src/lib/libssl/ssl_tlsext.c index c1d7ba14f2..e66bd08f84 100644 --- a/src/lib/libssl/ssl_tlsext.c +++ b/src/lib/libssl/ssl_tlsext.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_tlsext.c,v 1.53 2020/01/22 10:36:57 tb Exp $ */ | 1 | /* $OpenBSD: ssl_tlsext.c,v 1.54 2020/01/22 10:38:11 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2016, 2017, 2019 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2016, 2017, 2019 Joel Sing <jsing@openbsd.org> |
| 4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> | 4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> |
| @@ -781,7 +781,7 @@ tlsext_ocsp_client_build(SSL *s, CBB *cbb) | |||
| 781 | int | 781 | int |
| 782 | tlsext_ocsp_server_parse(SSL *s, CBS *cbs, int *alert) | 782 | tlsext_ocsp_server_parse(SSL *s, CBS *cbs, int *alert) |
| 783 | { | 783 | { |
| 784 | int failure = SSL_AD_DECODE_ERROR; | 784 | int alert_desc = SSL_AD_DECODE_ERROR; |
| 785 | CBS respid_list, respid, exts; | 785 | CBS respid_list, respid, exts; |
| 786 | const unsigned char *p; | 786 | const unsigned char *p; |
| 787 | uint8_t status_type; | 787 | uint8_t status_type; |
| @@ -809,7 +809,7 @@ tlsext_ocsp_server_parse(SSL *s, CBS *cbs, int *alert) | |||
| 809 | if (CBS_len(&respid_list) > 0) { | 809 | if (CBS_len(&respid_list) > 0) { |
| 810 | s->internal->tlsext_ocsp_ids = sk_OCSP_RESPID_new_null(); | 810 | s->internal->tlsext_ocsp_ids = sk_OCSP_RESPID_new_null(); |
| 811 | if (s->internal->tlsext_ocsp_ids == NULL) { | 811 | if (s->internal->tlsext_ocsp_ids == NULL) { |
| 812 | failure = SSL_AD_INTERNAL_ERROR; | 812 | alert_desc = SSL_AD_INTERNAL_ERROR; |
| 813 | goto err; | 813 | goto err; |
| 814 | } | 814 | } |
| 815 | } | 815 | } |
| @@ -823,7 +823,7 @@ tlsext_ocsp_server_parse(SSL *s, CBS *cbs, int *alert) | |||
| 823 | if ((id = d2i_OCSP_RESPID(NULL, &p, CBS_len(&respid))) == NULL) | 823 | if ((id = d2i_OCSP_RESPID(NULL, &p, CBS_len(&respid))) == NULL) |
| 824 | goto err; | 824 | goto err; |
| 825 | if (!sk_OCSP_RESPID_push(s->internal->tlsext_ocsp_ids, id)) { | 825 | if (!sk_OCSP_RESPID_push(s->internal->tlsext_ocsp_ids, id)) { |
| 826 | failure = SSL_AD_INTERNAL_ERROR; | 826 | alert_desc = SSL_AD_INTERNAL_ERROR; |
| 827 | OCSP_RESPID_free(id); | 827 | OCSP_RESPID_free(id); |
| 828 | goto err; | 828 | goto err; |
| 829 | } | 829 | } |
| @@ -848,7 +848,7 @@ tlsext_ocsp_server_parse(SSL *s, CBS *cbs, int *alert) | |||
| 848 | ret = 1; | 848 | ret = 1; |
| 849 | err: | 849 | err: |
| 850 | if (ret == 0) | 850 | if (ret == 0) |
| 851 | *alert = failure; | 851 | *alert = alert_desc; |
| 852 | return ret; | 852 | return ret; |
| 853 | } | 853 | } |
| 854 | 854 | ||
