diff options
| author |   beck <beck@openbsd.org> | 2020-09-14 12:33:51 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2020-09-14 12:33:51 +0000 |
| commit | 6b178030d616e9383b19c7a58a581b2be616bc23 (patch) | |
| tree | dadf6a04bcc1029ae86e3d40554dca32b9c7f3d8 | |
| parent | nuke a stray space (diff) | |
| download | wireguard-openbsd-6b178030d616e9383b19c7a58a581b2be616bc23.tar.xz wireguard-openbsd-6b178030d616e9383b19c7a58a581b2be616bc23.zip | |
Set error if we are given an NULL ctx in x509_verify, and set error
to X509_V_ERR_OUT_OF_MEM instead of UNSPECIFIED in chain_append when
allocation fails.
noticed by ingo@
ok tb@
| -rw-r--r-- | lib/libcrypto/x509/x509_verify.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/libcrypto/x509/x509_verify.c b/lib/libcrypto/x509/x509_verify.c index 80af892d8a4..431f5ab1bcb 100644 --- a/lib/libcrypto/x509/x509_verify.c +++ b/lib/libcrypto/x509/x509_verify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_verify.c,v 1.5 2020/09/14 12:00:55 tb Exp $ */ +/* $OpenBSD: x509_verify.c,v 1.6 2020/09/14 12:33:51 beck Exp $ */ /* * Copyright (c) 2020 Bob Beck <beck@openbsd.org> * @@ -108,7 +108,7 @@ x509_verify_chain_append(struct x509_verify_chain *chain, X509 *cert, X509_up_ref(cert); if (!sk_X509_push(chain->certs, cert)) { X509_free(cert); - *error = X509_V_ERR_UNSPECIFIED; + *error = X509_V_ERR_OUT_OF_MEM; return 0; } return 1; @@ -833,9 +833,7 @@ x509_verify(struct x509_verify_ctx *ctx, X509 *leaf, char *name) { struct x509_verify_chain *current_chain; - if (ctx == NULL) - return 0; - if (ctx->roots == NULL || ctx->max_depth == 0) { + if (ctx == NULL || ctx->roots == NULL || ctx->max_depth == 0) { ctx->error = X509_V_ERR_INVALID_CALL; return 0; } |