author | Misaki Miyashita <Misaki.Miyashita@Oracle.COM> |
Fri, 10 Jul 2015 14:15:09 -0700 | |
branch | s11-update |
changeset 4626 | d5dbb6652eec |
parent 4489 | 2713cbca9e1e |
permissions | -rw-r--r-- |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
1 |
This patch comes from OpenSSL upstream code, and the change has been commited to OpenSSL 1.0.2. |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
2 |
http://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=fbd2164044f92383955a801ad1b2857d71e83f27 |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
3 |
http://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=51e7a4378a78bb0870a2cdc5c524c230c929ebcb |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
4 |
http://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=2dabd822366df7b2608b55d5ca5f31d5d484cbaf |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
5 |
|
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
6 |
Index: openssl/crypto/x509/x509_trs.c |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
7 |
============================================================================ |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
8 |
$ diff -ru crypto/x509/x509_trs.c crypto/x509/x509_trs.c |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
9 |
--- openssl/crypto/x509/x509_trs.c.orig 4 Dec 2012 17:26:04 -0000 1.133.2.11.2.6.2.3 |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
10 |
+++ openssl/crypto/x509/x509_trs.c 14 Dec 2012 14:30:45 -0000 1.133.2.11.2.6.2.4 |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
11 |
@@ -119,6 +119,14 @@ int X509_check_trust(X509 *x, int id, int flags) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
12 |
int idx; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
13 |
if (id == -1) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
14 |
return 1; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
15 |
+ /* We get this as a default value */ |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
16 |
+ if (id == 0) { |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
17 |
+ int rv; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
18 |
+ rv = obj_trust(NID_anyExtendedKeyUsage, x, 0); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
19 |
+ if (rv != X509_TRUST_UNTRUSTED) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
20 |
+ return rv; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
21 |
+ return trust_compat(NULL, x, 0); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
22 |
+ } |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
23 |
idx = X509_TRUST_get_by_id(id); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
24 |
if (idx == -1) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
25 |
return default_trust(id, x, flags); |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
26 |
Index: openssl/crypto/x509/x509_vfy.c |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
27 |
============================================================================ |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
28 |
$ cvs diff -u -r1.105.2.9.2.4.2.3 -r1.105.2.9.2.4.2.4 x509_vfy.c |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
29 |
--- openssl/crypto/x509/x509_vfy.c 14 Dec 2012 12:53:48 -0000 1.105.2.9.2.4.2.3 |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
30 |
+++ openssl/crypto/x509/x509_vfy.c 14 Dec 2012 14:30:46 -0000 1.105.2.9.2.4.2.4 |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
31 |
@@ -149,6 +149,33 @@ |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
32 |
} |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
33 |
#endif |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
34 |
|
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
35 |
+/* Given a certificate try and find an exact match in the store */ |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
36 |
+ |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
37 |
+static X509 *lookup_cert_match(X509_STORE_CTX *ctx, X509 *x) |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
38 |
+ { |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
39 |
+ STACK_OF(X509) *certs; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
40 |
+ X509 *xtmp = NULL; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
41 |
+ int i; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
42 |
+ /* Lookup all certs with matching subject name */ |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
43 |
+ certs = ctx->lookup_certs(ctx, X509_get_subject_name(x)); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
44 |
+ if (certs == NULL) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
45 |
+ return NULL; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
46 |
+ /* Look for exact match */ |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
47 |
+ for (i = 0; i < sk_X509_num(certs); i++) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
48 |
+ { |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
49 |
+ xtmp = sk_X509_value(certs, i); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
50 |
+ if (!X509_cmp(xtmp, x)) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
51 |
+ break; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
52 |
+ } |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
53 |
+ if (i < sk_X509_num(certs)) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
54 |
+ CRYPTO_add(&xtmp->references,1,CRYPTO_LOCK_X509); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
55 |
+ else |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
56 |
+ xtmp = NULL; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
57 |
+ sk_X509_pop_free(certs, X509_free); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
58 |
+ return xtmp; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
59 |
+ } |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
60 |
+ |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
61 |
+ |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
62 |
int X509_verify_cert(X509_STORE_CTX *ctx) |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
63 |
{ |
4626
d5dbb6652eec
21416447 Upgrade OpenSSL version to 1.0.1p
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4489
diff
changeset
|
64 |
X509 *x, *xtmp, *xtmp2, *chain_ss = NULL; |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
65 |
@@ -304,8 +331,17 @@ int X509_verify_cert(X509_STORE_CTX *ctx) |
4626
d5dbb6652eec
21416447 Upgrade OpenSSL version to 1.0.1p
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4489
diff
changeset
|
66 |
} |
d5dbb6652eec
21416447 Upgrade OpenSSL version to 1.0.1p
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4489
diff
changeset
|
67 |
} while (retry); |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
68 |
|
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
69 |
- /* Is last certificate looked up self signed? */ |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
70 |
- if (!ctx->check_issued(ctx, x, x)) { |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
71 |
+ i = check_trust(ctx); |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
72 |
+ |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
73 |
+ /* If explicitly rejected error */ |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
74 |
+ if (i == X509_TRUST_REJECTED) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
75 |
+ goto end; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
76 |
+ /* |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
77 |
+ * If not explicitly trusted then indicate error unless it's a single |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
78 |
+ * self signed certificate in which case we've indicated an error already |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
79 |
+ * and set bad_chain == 1 |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
80 |
+ */ |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
81 |
+ if (i != X509_TRUST_TRUSTED && !bad_chain) { |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
82 |
if ((chain_ss == NULL) || !ctx->check_issued(ctx, x, chain_ss)) { |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
83 |
if (ctx->last_untrusted >= num) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
84 |
ctx->error = X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
85 |
@@ -340,14 +376,6 @@ int X509_verify_cert(X509_STORE_CTX *ctx) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
86 |
ok = check_name_constraints(ctx); |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
87 |
|
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
88 |
if (!ok) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
89 |
- goto end; |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
90 |
- |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
91 |
- /* The chain extensions are OK: check trust */ |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
92 |
- |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
93 |
- if (param->trust > 0) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
94 |
- ok = check_trust(ctx); |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
95 |
- |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
96 |
- if (!ok) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
97 |
goto end; |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
98 |
|
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
99 |
/* We may as well copy down any DSA parameters that are required */ |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
100 |
@@ -630,28 +658,53 @@ static int check_name_constraints(X509_STORE_CTX *ctx) |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
101 |
|
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
102 |
static int check_trust(X509_STORE_CTX *ctx) |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
103 |
{ |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
104 |
-#ifdef OPENSSL_NO_CHAIN_VERIFY |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
105 |
- return 1; |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
106 |
-#else |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
107 |
int i, ok; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
108 |
- X509 *x; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
109 |
+ X509 *x = NULL; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
110 |
int (*cb) (int xok, X509_STORE_CTX *xctx); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
111 |
cb = ctx->verify_cb; |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
112 |
-/* For now just check the last certificate in the chain */ |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
113 |
- i = sk_X509_num(ctx->chain) - 1; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
114 |
- x = sk_X509_value(ctx->chain, i); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
115 |
- ok = X509_check_trust(x, ctx->param->trust, 0); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
116 |
- if (ok == X509_TRUST_TRUSTED) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
117 |
- return 1; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
118 |
- ctx->error_depth = i; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
119 |
- ctx->current_cert = x; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
120 |
- if (ok == X509_TRUST_REJECTED) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
121 |
- ctx->error = X509_V_ERR_CERT_REJECTED; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
122 |
- else |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
123 |
- ctx->error = X509_V_ERR_CERT_UNTRUSTED; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
124 |
- ok = cb(0, ctx); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
125 |
- return ok; |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
126 |
-#endif |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
127 |
+ /* Check all trusted certificates in chain */ |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
128 |
+ for (i = ctx->last_untrusted; i < sk_X509_num(ctx->chain); i++) { |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
129 |
+ x = sk_X509_value(ctx->chain, i); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
130 |
+ ok = X509_check_trust(x, ctx->param->trust, 0); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
131 |
+ /* If explicitly trusted return trusted */ |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
132 |
+ if (ok == X509_TRUST_TRUSTED) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
133 |
+ return X509_TRUST_TRUSTED; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
134 |
+ /* |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
135 |
+ * If explicitly rejected notify callback and reject if not |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
136 |
+ * overridden. |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
137 |
+ */ |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
138 |
+ if (ok == X509_TRUST_REJECTED) { |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
139 |
+ ctx->error_depth = i; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
140 |
+ ctx->current_cert = x; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
141 |
+ ctx->error = X509_V_ERR_CERT_REJECTED; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
142 |
+ ok = cb(0, ctx); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
143 |
+ if (!ok) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
144 |
+ return X509_TRUST_REJECTED; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
145 |
+ } |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
146 |
+ } |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
147 |
+ /* |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
148 |
+ * If we accept partial chains and have at least one trusted certificate |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
149 |
+ * return success. |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
150 |
+ */ |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
151 |
+ if (ctx->param->flags & X509_V_FLAG_PARTIAL_CHAIN) { |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
152 |
+ X509 *mx; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
153 |
+ if (ctx->last_untrusted < sk_X509_num(ctx->chain)) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
154 |
+ return X509_TRUST_TRUSTED; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
155 |
+ x = sk_X509_value(ctx->chain, 0); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
156 |
+ mx = lookup_cert_match(ctx, x); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
157 |
+ if (mx) { |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
158 |
+ (void)sk_X509_set(ctx->chain, 0, mx); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
159 |
+ X509_free(x); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
160 |
+ ctx->last_untrusted = 0; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
161 |
+ return X509_TRUST_TRUSTED; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
162 |
+ } |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
163 |
+ } |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
164 |
+ |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
165 |
+ /* |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
166 |
+ * If no trusted certs in chain at all return untrusted and allow |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
167 |
+ * standard (no issuer cert) etc errors to be indicated. |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
168 |
+ */ |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
169 |
+ return X509_TRUST_UNTRUSTED; |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
170 |
} |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
171 |
|
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
172 |
static int check_revocation(X509_STORE_CTX *ctx) |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
173 |
@@ -1526,6 +1579,8 @@ static int internal_verify(X509_STORE_CTX *ctx) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
174 |
if (ctx->check_issued(ctx, xi, xi)) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
175 |
xs = xi; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
176 |
else { |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
177 |
+ if (ctx->param->flags & X509_V_FLAG_PARTIAL_CHAIN && n == 0) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
178 |
+ return check_cert_time(ctx, xi); |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
179 |
if (n <= 0) { |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
180 |
ctx->error = X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
181 |
ctx->current_cert = xi; |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
182 |
Index: openssl/crypto/x509/x509_vfy.h |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
183 |
============================================================================ |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
184 |
$ cvs diff -u -r1.67.2.3.4.1 -r1.67.2.3.4.2 x509_vfy.h |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
185 |
--- openssl/crypto/x509/x509_vfy.h 26 Sep 2012 13:50:42 -0000 1.67.2.3.4.1 |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
186 |
+++ openssl/crypto/x509/x509_vfy.h 14 Dec 2012 14:30:46 -0000 1.67.2.3.4.2 |
4626
d5dbb6652eec
21416447 Upgrade OpenSSL version to 1.0.1p
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4489
diff
changeset
|
187 |
@@ -412,6 +412,9 @@ |
d5dbb6652eec
21416447 Upgrade OpenSSL version to 1.0.1p
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4489
diff
changeset
|
188 |
*/ |
d5dbb6652eec
21416447 Upgrade OpenSSL version to 1.0.1p
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4489
diff
changeset
|
189 |
# define X509_V_FLAG_NO_ALT_CHAINS 0x100000 |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
190 |
|
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
191 |
+/* Allow partial chains if at least one certificate is in trusted store */ |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
192 |
+# define X509_V_FLAG_PARTIAL_CHAIN 0x80000 |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
193 |
+ |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
194 |
# define X509_VP_FLAG_DEFAULT 0x1 |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
195 |
# define X509_VP_FLAG_OVERWRITE 0x2 |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
196 |
# define X509_VP_FLAG_RESET_FLAGS 0x4 |
2801
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
197 |
Index: openssl/apps/apps.c |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
198 |
============================================================================ |
02364d9168f2
16623515 OpenSSL: Need to update the license file
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
diff
changeset
|
199 |
$ cvs diff -u -r1.133.2.11.2.6.2.3 -r1.133.2.11.2.6.2.4 apps.c |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
200 |
--- openssl/apps/apps.c 4 Dec 2012 17:26:04 -0000 1.133.2.11.2.6.2.3 |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
201 |
+++ openssl/apps/apps.c 14 Dec 2012 14:30:45 -0000 1.133.2.11.2.6.2.4 |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
202 |
@@ -2238,6 +2238,8 @@ |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
203 |
flags |= X509_V_FLAG_NOTIFY_POLICY; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
204 |
else if (!strcmp(arg, "-check_ss_sig")) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
205 |
flags |= X509_V_FLAG_CHECK_SS_SIGNATURE; |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
206 |
+ else if (!strcmp(arg, "-partial_chain")) |
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
207 |
+ flags |= X509_V_FLAG_PARTIAL_CHAIN; |
4489
2713cbca9e1e
21240304 Upgrade OpenSSL version to 1.0.1o
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4006
diff
changeset
|
208 |
else if (!strcmp(arg, "-no_alt_chains")) |
2713cbca9e1e
21240304 Upgrade OpenSSL version to 1.0.1o
jenny.yung@oracle.com <jenny.yung@oracle.com>
parents:
4006
diff
changeset
|
209 |
flags |= X509_V_FLAG_NO_ALT_CHAINS; |
4006
c737cefdce54
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2921
diff
changeset
|
210 |
else |