Make explicit_policy handling match expected RFC3280 behaviour.

a9ff742e · Dr. Stephen Henson · 787287af · a9ff742e
隐藏空白更改
内联并排

Showing with 4 addition and 4 deletion

crypto/x509v3/pcy_tree.c crypto/x509v3/pcy_tree.c +4 -4

未找到文件。
--- a/crypto/x509v3/pcy_tree.c
+++ b/crypto/x509v3/pcy_tree.c
@@ -130,11 +130,11 @@ static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
 			ret = 2;
 		if (explicit_policy > 0)
 			{
-			explicit_policy--;
-			if (!(x->ex_flags & EXFLAG_SI)
-				&& (cache->explicit_skip != -1)
+			if (!(x->ex_flags & EXFLAG_SI))
+				explicit_policy--;
+			if ((cache->explicit_skip != -1)
 				&& (cache->explicit_skip < explicit_policy))
-				explicit_policy = cache->explicit_skip + 1;
+				explicit_policy = cache->explicit_skip;
 			}
 		}