diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/x509/x509_constraints.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_vfy.c | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/libcrypto/x509/x509_constraints.c b/src/lib/libcrypto/x509/x509_constraints.c index 8fafadfcdf..34795c0796 100644 --- a/src/lib/libcrypto/x509/x509_constraints.c +++ b/src/lib/libcrypto/x509/x509_constraints.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_constraints.c,v 1.6 2020/09/20 18:22:31 beck Exp $ */ | 1 | /* $OpenBSD: x509_constraints.c,v 1.7 2020/09/20 18:32:33 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2020 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2020 Bob Beck <beck@openbsd.org> |
| 4 | * | 4 | * |
| @@ -448,7 +448,7 @@ x509_constraints_valid_domain_constraint(uint8_t *constraint, size_t len) | |||
| 448 | * with end of URI, '/', '?', "#', or ':'. | 448 | * with end of URI, '/', '?', "#', or ':'. |
| 449 | */ | 449 | */ |
| 450 | int | 450 | int |
| 451 | x509_constraints_uri_host(uint8_t *uri, size_t len, char**hostpart) | 451 | x509_constraints_uri_host(uint8_t *uri, size_t len, char **hostpart) |
| 452 | { | 452 | { |
| 453 | size_t i, hostlen = 0; | 453 | size_t i, hostlen = 0; |
| 454 | uint8_t *authority = NULL; | 454 | uint8_t *authority = NULL; |
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c index 99a699f99e..584dd09ed1 100644 --- a/src/lib/libcrypto/x509/x509_vfy.c +++ b/src/lib/libcrypto/x509/x509_vfy.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_vfy.c,v 1.79 2020/09/15 11:55:14 beck Exp $ */ | 1 | /* $OpenBSD: x509_vfy.c,v 1.80 2020/09/20 18:32:33 tb 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 | * |
| @@ -1664,9 +1664,10 @@ check_crl(X509_STORE_CTX *ctx, X509_CRL *crl) | |||
| 1664 | if (ctx->current_issuer) { | 1664 | if (ctx->current_issuer) { |
| 1665 | issuer = ctx->current_issuer; | 1665 | issuer = ctx->current_issuer; |
| 1666 | } else if (cnum < chnum) { | 1666 | } else if (cnum < chnum) { |
| 1667 | /* Else find CRL issuer: if not last certificate then issuer | 1667 | /* |
| 1668 | * is next certificate in chain. | 1668 | * Else find CRL issuer: if not last certificate then issuer |
| 1669 | */ | 1669 | * is next certificate in chain. |
| 1670 | */ | ||
| 1670 | issuer = sk_X509_value(ctx->chain, cnum + 1); | 1671 | issuer = sk_X509_value(ctx->chain, cnum + 1); |
| 1671 | } else { | 1672 | } else { |
| 1672 | issuer = sk_X509_value(ctx->chain, chnum); | 1673 | issuer = sk_X509_value(ctx->chain, chnum); |
