sync with OpenBSD -current

lib/libcrypto/x509/by_dir.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: by_dir.c,v 1.46 2023/12/29 05:33:32 tb Exp $ */
+/* $OpenBSD: by_dir.c,v 1.47 2024/03/25 00:05:49 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,9 +56,6 @@
  * [including the GNU Public Licence.]
  */
 
-#include <sys/stat.h>
-#include <sys/types.h>
-
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
@@ -331,23 +328,27 @@ get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name,
 		for (;;) {
 			(void) snprintf(b->data, b->max, "%s/%08lx.%s%d",
 			    ent->dir, h, postfix, k);
-
-			{
-				struct stat st;
-				if (stat(b->data, &st) < 0)
-					break;
-			}
-			/* found one. */
+			/*
+			 * Found one. Attempt to load it. This could fail for
+			 * any number of reasons from the file can't be opened,
+			 * the file contains garbage, etc. Clear the error stack
+			 * to avoid exposing the lower level error. These all
+			 * boil down to "we could not find CA/CRL".
+			 */
 			if (type == X509_LU_X509) {
 				if ((X509_load_cert_file(xl, b->data,
-				    ent->dir_type)) == 0)
+				    ent->dir_type)) == 0) {
+					ERR_clear_error();
 					break;
+				}
 			} else if (type == X509_LU_CRL) {
 				if ((X509_load_crl_file(xl, b->data,
-				    ent->dir_type)) == 0)
+				    ent->dir_type)) == 0) {
+					ERR_clear_error();
 					break;
+				}
 			}
-			/* else case will caught higher up */
+			/* The lack of a CA or CRL will be caught higher up. */
 			k++;
 		}
 

lib/libcrypto/x509/x509_trs.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_trs.c,v 1.45 2024/03/24 00:35:45 tb Exp $ */
+/* $OpenBSD: x509_trs.c,v 1.49 2024/03/25 00:46:57 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -65,12 +65,13 @@
 #include <openssl/x509v3.h>
 
 #include "crypto_internal.h"
+#include "x509_internal.h"
 #include "x509_local.h"
 
 typedef struct x509_trust_st {
 	int trust;
 	int (*check_trust)(struct x509_trust_st *, X509 *);
-	int arg1;
+	int nid;
 } X509_TRUST;
 
 static int
@@ -78,34 +79,32 @@ obj_trust(int id, X509 *x)
 {
 	ASN1_OBJECT *obj;
 	int i, nid;
-	X509_CERT_AUX *ax;
+	X509_CERT_AUX *aux;
 
-	ax = x->aux;
-	if (!ax)
+	if ((aux = x->aux) == NULL)
 		return X509_TRUST_UNTRUSTED;
-	if (ax->reject) {
-		for (i = 0; i < sk_ASN1_OBJECT_num(ax->reject); i++) {
-			obj = sk_ASN1_OBJECT_value(ax->reject, i);
-			nid = OBJ_obj2nid(obj);
-			if (nid == id || nid == NID_anyExtendedKeyUsage)
-				return X509_TRUST_REJECTED;
-		}
+
+	for (i = 0; i < sk_ASN1_OBJECT_num(aux->reject); i++) {
+		obj = sk_ASN1_OBJECT_value(aux->reject, i);
+		nid = OBJ_obj2nid(obj);
+		if (nid == id || nid == NID_anyExtendedKeyUsage)
+			return X509_TRUST_REJECTED;
 	}
-	if (ax->trust) {
-		for (i = 0; i < sk_ASN1_OBJECT_num(ax->trust); i++) {
-			obj = sk_ASN1_OBJECT_value(ax->trust, i);
-			nid = OBJ_obj2nid(obj);
-			if (nid == id || nid == NID_anyExtendedKeyUsage)
-				return X509_TRUST_TRUSTED;
-		}
+
+	for (i = 0; i < sk_ASN1_OBJECT_num(aux->trust); i++) {
+		obj = sk_ASN1_OBJECT_value(aux->trust, i);
+		nid = OBJ_obj2nid(obj);
+		if (nid == id || nid == NID_anyExtendedKeyUsage)
+			return X509_TRUST_TRUSTED;
 	}
+
 	return X509_TRUST_UNTRUSTED;
 }
 
 static int
 trust_compat(X509_TRUST *trust, X509 *x)
 {
-	X509_check_purpose(x, -1, 0);
+	/* Extensions already cached in X509_check_trust(). */
 	if (x->ex_flags & EXFLAG_SS)
 		return X509_TRUST_TRUSTED;
 	else
@@ -116,7 +115,7 @@ static int
 trust_1oidany(X509_TRUST *trust, X509 *x)
 {
 	if (x->aux && (x->aux->trust || x->aux->reject))
-		return obj_trust(trust->arg1, x);
+		return obj_trust(trust->nid, x);
 	/* we don't have any trust settings: for compatibility
 	 * we return trusted if it is self signed
 	 */
@@ -127,7 +126,7 @@ static int
 trust_1oid(X509_TRUST *trust, X509 *x)
 {
 	if (x->aux)
-		return obj_trust(trust->arg1, x);
+		return obj_trust(trust->nid, x);
 	return X509_TRUST_UNTRUSTED;
 }
 
@@ -144,37 +143,37 @@ static const X509_TRUST trstandard[] = {
 	{
 		.trust = X509_TRUST_SSL_CLIENT,
 		.check_trust = trust_1oidany,
-		.arg1 = NID_client_auth,
+		.nid = NID_client_auth,
 	},
 	{
 		.trust = X509_TRUST_SSL_SERVER,
 		.check_trust = trust_1oidany,
-		.arg1 = NID_server_auth,
+		.nid = NID_server_auth,
 	},
 	{
 		.trust = X509_TRUST_EMAIL,
 		.check_trust = trust_1oidany,
-		.arg1 = NID_email_protect,
+		.nid = NID_email_protect,
 	},
 	{
 		.trust = X509_TRUST_OBJECT_SIGN,
 		.check_trust = trust_1oidany,
-		.arg1 = NID_code_sign,
+		.nid = NID_code_sign,
 	},
 	{
 		.trust = X509_TRUST_OCSP_SIGN,
 		.check_trust = trust_1oid,
-		.arg1 = NID_OCSP_sign,
+		.nid = NID_OCSP_sign,
 	},
 	{
 		.trust = X509_TRUST_OCSP_REQUEST,
 		.check_trust = trust_1oid,
-		.arg1 = NID_ad_OCSP,
+		.nid = NID_ad_OCSP,
 	},
 	{
 		.trust = X509_TRUST_TSA,
 		.check_trust = trust_1oidany,
-		.arg1 = NID_time_stamp,
+		.nid = NID_time_stamp,
 	},
 };
 
@@ -191,6 +190,10 @@ X509_check_trust(X509 *x, int trust_id, int flags)
 	if (trust_id == -1)
 		return 1;
 
+	/* Call early so the trust handlers don't need to modify the certs. */
+	if (!x509v3_cache_extensions(x))
+		return X509_TRUST_UNTRUSTED;
+
 	/*
 	 * XXX beck/jsing This enables self signed certs to be trusted for
 	 * an unspecified id/trust flag value (this is NOT the