summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorderaadt <>2020-09-26 02:06:28 +0000
committerderaadt <>2020-09-26 02:06:28 +0000
commitaf7c6ade0d2208202ee8003159d10cf52d688e00 (patch)
treef4edbffc66c9fc934fbe1692763b33f36a332c87
parent733583e427fa89cfe555a41fbbcdd252be0f0b5a (diff)
downloadopenbsd-af7c6ade0d2208202ee8003159d10cf52d688e00.tar.gz
openbsd-af7c6ade0d2208202ee8003159d10cf52d688e00.tar.bz2
openbsd-af7c6ade0d2208202ee8003159d10cf52d688e00.zip
jumping into the x509 fray with a bunch of whitespace repair
-rw-r--r--src/lib/libcrypto/x509/x509_vfy.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c
index 584dd09ed1..fe1431ce49 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.80 2020/09/20 18:32:33 tb Exp $ */ 1/* $OpenBSD: x509_vfy.c,v 1.81 2020/09/26 02:06:28 deraadt 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 *
@@ -1889,7 +1889,7 @@ x509_check_cert_time(X509_STORE_CTX *ctx, X509 *x, int depth)
1889 X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD)) 1889 X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD))
1890 return 0; 1890 return 0;
1891 if (i > 0 && !verify_cb_cert(ctx, x, depth, 1891 if (i > 0 && !verify_cb_cert(ctx, x, depth,
1892 X509_V_ERR_CERT_NOT_YET_VALID)) 1892 X509_V_ERR_CERT_NOT_YET_VALID))
1893 return 0; 1893 return 0;
1894 1894
1895 i = X509_cmp_time_internal(X509_get_notAfter(x), ptime, 1); 1895 i = X509_cmp_time_internal(X509_get_notAfter(x), ptime, 1);
@@ -1941,16 +1941,16 @@ internal_verify(X509_STORE_CTX *ctx)
1941 * certificate and its depth (rather than the depth of 1941 * certificate and its depth (rather than the depth of
1942 * the subject). 1942 * the subject).
1943 */ 1943 */
1944 if (xs != xi || (ctx->param->flags & 1944 if (xs != xi ||
1945 X509_V_FLAG_CHECK_SS_SIGNATURE)) { 1945 (ctx->param->flags & X509_V_FLAG_CHECK_SS_SIGNATURE)) {
1946 EVP_PKEY *pkey; 1946 EVP_PKEY *pkey;
1947 if ((pkey = X509_get_pubkey(xi)) == NULL) { 1947 if ((pkey = X509_get_pubkey(xi)) == NULL) {
1948 if (!verify_cb_cert(ctx, xi, xi != xs ? n+1 : n, 1948 if (!verify_cb_cert(ctx, xi, xi != xs ? n+1 : n,
1949 X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY)) 1949 X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY))
1950 return 0; 1950 return 0;
1951 } else if (X509_verify(xs, pkey) <= 0) { 1951 } else if (X509_verify(xs, pkey) <= 0) {
1952 if (!verify_cb_cert(ctx, xs, n, 1952 if (!verify_cb_cert(ctx, xs, n,
1953 X509_V_ERR_CERT_SIGNATURE_FAILURE)) { 1953 X509_V_ERR_CERT_SIGNATURE_FAILURE)) {
1954 EVP_PKEY_free(pkey); 1954 EVP_PKEY_free(pkey);
1955 return 0; 1955 return 0;
1956 } 1956 }