diff options
Diffstat (limited to '')
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/ext_dat.h (renamed from drivers/builtin_openssl/crypto/x509v3/ext_dat.h) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/pcy_cache.c (renamed from drivers/builtin_openssl/crypto/x509v3/pcy_cache.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/pcy_data.c (renamed from drivers/builtin_openssl/crypto/x509v3/pcy_data.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/pcy_int.h (renamed from drivers/builtin_openssl/crypto/x509v3/pcy_int.h) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/pcy_lib.c (renamed from drivers/builtin_openssl/crypto/x509v3/pcy_lib.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/pcy_map.c (renamed from drivers/builtin_openssl/crypto/x509v3/pcy_map.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/pcy_node.c (renamed from drivers/builtin_openssl/crypto/x509v3/pcy_node.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/pcy_tree.c (renamed from drivers/builtin_openssl/crypto/x509v3/pcy_tree.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/tabtest.c (renamed from drivers/builtin_openssl/crypto/x509v3/tabtest.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_addr.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_addr.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_akey.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_akey.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_akeya.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_akeya.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_alt.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_alt.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_asid.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_asid.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_bcons.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_bcons.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_bitst.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_bitst.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_conf.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_conf.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_cpols.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_cpols.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_crld.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_crld.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_enum.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_enum.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_extku.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_extku.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_genn.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_genn.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_ia5.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_ia5.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_info.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_info.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_int.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_int.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_lib.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_lib.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_ncons.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_ncons.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_ocsp.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_ocsp.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_pci.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_pci.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_pcia.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_pcia.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_pcons.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_pcons.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_pku.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_pku.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_pmaps.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_pmaps.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_prn.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_prn.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_purp.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_purp.c) | 6 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_skey.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_skey.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_sxnet.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_sxnet.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3_utl.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3_utl.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3conf.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3conf.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3err.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3err.c) | 0 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/crypto/x509v3/v3prin.c (renamed from drivers/builtin_openssl/crypto/x509v3/v3prin.c) | 0 |
41 files changed, 3 insertions, 3 deletions
diff --git a/drivers/builtin_openssl/crypto/x509v3/ext_dat.h b/drivers/builtin_openssl2/crypto/x509v3/ext_dat.h index 76daee6fc..76daee6fc 100644 --- a/drivers/builtin_openssl/crypto/x509v3/ext_dat.h +++ b/drivers/builtin_openssl2/crypto/x509v3/ext_dat.h diff --git a/drivers/builtin_openssl/crypto/x509v3/pcy_cache.c b/drivers/builtin_openssl2/crypto/x509v3/pcy_cache.c index 172b7e7ee..172b7e7ee 100644 --- a/drivers/builtin_openssl/crypto/x509v3/pcy_cache.c +++ b/drivers/builtin_openssl2/crypto/x509v3/pcy_cache.c diff --git a/drivers/builtin_openssl/crypto/x509v3/pcy_data.c b/drivers/builtin_openssl2/crypto/x509v3/pcy_data.c index 3444b0319..3444b0319 100644 --- a/drivers/builtin_openssl/crypto/x509v3/pcy_data.c +++ b/drivers/builtin_openssl2/crypto/x509v3/pcy_data.c diff --git a/drivers/builtin_openssl/crypto/x509v3/pcy_int.h b/drivers/builtin_openssl2/crypto/x509v3/pcy_int.h index ccff92846..ccff92846 100644 --- a/drivers/builtin_openssl/crypto/x509v3/pcy_int.h +++ b/drivers/builtin_openssl2/crypto/x509v3/pcy_int.h diff --git a/drivers/builtin_openssl/crypto/x509v3/pcy_lib.c b/drivers/builtin_openssl2/crypto/x509v3/pcy_lib.c index 93bfd9270..93bfd9270 100644 --- a/drivers/builtin_openssl/crypto/x509v3/pcy_lib.c +++ b/drivers/builtin_openssl2/crypto/x509v3/pcy_lib.c diff --git a/drivers/builtin_openssl/crypto/x509v3/pcy_map.c b/drivers/builtin_openssl2/crypto/x509v3/pcy_map.c index 21163b529..21163b529 100644 --- a/drivers/builtin_openssl/crypto/x509v3/pcy_map.c +++ b/drivers/builtin_openssl2/crypto/x509v3/pcy_map.c diff --git a/drivers/builtin_openssl/crypto/x509v3/pcy_node.c b/drivers/builtin_openssl2/crypto/x509v3/pcy_node.c index bd1e7f1ae..bd1e7f1ae 100644 --- a/drivers/builtin_openssl/crypto/x509v3/pcy_node.c +++ b/drivers/builtin_openssl2/crypto/x509v3/pcy_node.c diff --git a/drivers/builtin_openssl/crypto/x509v3/pcy_tree.c b/drivers/builtin_openssl2/crypto/x509v3/pcy_tree.c index bb9777348..bb9777348 100644 --- a/drivers/builtin_openssl/crypto/x509v3/pcy_tree.c +++ b/drivers/builtin_openssl2/crypto/x509v3/pcy_tree.c diff --git a/drivers/builtin_openssl/crypto/x509v3/tabtest.c b/drivers/builtin_openssl2/crypto/x509v3/tabtest.c index 5ed6eb689..5ed6eb689 100644 --- a/drivers/builtin_openssl/crypto/x509v3/tabtest.c +++ b/drivers/builtin_openssl2/crypto/x509v3/tabtest.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_addr.c b/drivers/builtin_openssl2/crypto/x509v3/v3_addr.c index df46a4983..df46a4983 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_addr.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_addr.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_akey.c b/drivers/builtin_openssl2/crypto/x509v3/v3_akey.c index c6b68ee22..c6b68ee22 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_akey.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_akey.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_akeya.c b/drivers/builtin_openssl2/crypto/x509v3/v3_akeya.c index 2c50f7360..2c50f7360 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_akeya.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_akeya.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_alt.c b/drivers/builtin_openssl2/crypto/x509v3/v3_alt.c index d29d94338..d29d94338 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_alt.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_alt.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_asid.c b/drivers/builtin_openssl2/crypto/x509v3/v3_asid.c index 1587e8ed7..1587e8ed7 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_asid.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_asid.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_bcons.c b/drivers/builtin_openssl2/crypto/x509v3/v3_bcons.c index 82aa488f7..82aa488f7 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_bcons.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_bcons.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_bitst.c b/drivers/builtin_openssl2/crypto/x509v3/v3_bitst.c index 058d0d4dc..058d0d4dc 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_bitst.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_bitst.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_conf.c b/drivers/builtin_openssl2/crypto/x509v3/v3_conf.c index 6730f9a6e..6730f9a6e 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_conf.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_conf.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_cpols.c b/drivers/builtin_openssl2/crypto/x509v3/v3_cpols.c index 1f0798b94..1f0798b94 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_cpols.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_cpols.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_crld.c b/drivers/builtin_openssl2/crypto/x509v3/v3_crld.c index 790a6dd03..790a6dd03 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_crld.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_crld.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_enum.c b/drivers/builtin_openssl2/crypto/x509v3/v3_enum.c index c0575e368..c0575e368 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_enum.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_enum.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_extku.c b/drivers/builtin_openssl2/crypto/x509v3/v3_extku.c index 1c6653275..1c6653275 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_extku.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_extku.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_genn.c b/drivers/builtin_openssl2/crypto/x509v3/v3_genn.c index b62835730..b62835730 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_genn.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_genn.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_ia5.c b/drivers/builtin_openssl2/crypto/x509v3/v3_ia5.c index 4ff12b52b..4ff12b52b 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_ia5.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_ia5.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_info.c b/drivers/builtin_openssl2/crypto/x509v3/v3_info.c index e1b8699f9..e1b8699f9 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_info.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_info.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_int.c b/drivers/builtin_openssl2/crypto/x509v3/v3_int.c index 4bfd14cf4..4bfd14cf4 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_int.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_int.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_lib.c b/drivers/builtin_openssl2/crypto/x509v3/v3_lib.c index 0f1e1d442..0f1e1d442 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_lib.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_lib.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_ncons.c b/drivers/builtin_openssl2/crypto/x509v3/v3_ncons.c index a01dc64dd..a01dc64dd 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_ncons.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_ncons.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_ocsp.c b/drivers/builtin_openssl2/crypto/x509v3/v3_ocsp.c index 0c165af31..0c165af31 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_ocsp.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_ocsp.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_pci.c b/drivers/builtin_openssl2/crypto/x509v3/v3_pci.c index 0dcfa004f..0dcfa004f 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_pci.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_pci.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_pcia.c b/drivers/builtin_openssl2/crypto/x509v3/v3_pcia.c index bb362e0e5..bb362e0e5 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_pcia.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_pcia.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_pcons.c b/drivers/builtin_openssl2/crypto/x509v3/v3_pcons.c index 30ca65235..30ca65235 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_pcons.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_pcons.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_pku.c b/drivers/builtin_openssl2/crypto/x509v3/v3_pku.c index 076f3ff48..076f3ff48 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_pku.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_pku.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_pmaps.c b/drivers/builtin_openssl2/crypto/x509v3/v3_pmaps.c index 865bcd398..865bcd398 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_pmaps.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_pmaps.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_prn.c b/drivers/builtin_openssl2/crypto/x509v3/v3_prn.c index 314621870..314621870 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_prn.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_prn.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_purp.c b/drivers/builtin_openssl2/crypto/x509v3/v3_purp.c index ad688657e..f59bfc184 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_purp.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_purp.c @@ -389,8 +389,8 @@ static void x509v3_cache_extensions(X509 *x) /* Handle proxy certificates */ if((pci=X509_get_ext_d2i(x, NID_proxyCertInfo, NULL, NULL))) { if (x->ex_flags & EXFLAG_CA - || X509_get_ext_by_NID(x, NID_subject_alt_name, 0) >= 0 - || X509_get_ext_by_NID(x, NID_issuer_alt_name, 0) >= 0) { + || X509_get_ext_by_NID(x, NID_subject_alt_name, -1) >= 0 + || X509_get_ext_by_NID(x, NID_issuer_alt_name, -1) >= 0) { x->ex_flags |= EXFLAG_INVALID; } if (pci->pcPathLengthConstraint) { @@ -670,7 +670,7 @@ static int check_purpose_timestamp_sign(const X509_PURPOSE *xp, const X509 *x, return 0; /* Extended Key Usage MUST be critical */ - i_ext = X509_get_ext_by_NID((X509 *) x, NID_ext_key_usage, 0); + i_ext = X509_get_ext_by_NID((X509 *) x, NID_ext_key_usage, -1); if (i_ext >= 0) { X509_EXTENSION *ext = X509_get_ext((X509 *) x, i_ext); diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_skey.c b/drivers/builtin_openssl2/crypto/x509v3/v3_skey.c index 0a984fbaa..0a984fbaa 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_skey.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_skey.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_sxnet.c b/drivers/builtin_openssl2/crypto/x509v3/v3_sxnet.c index 2a6bf11b6..2a6bf11b6 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_sxnet.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_sxnet.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3_utl.c b/drivers/builtin_openssl2/crypto/x509v3/v3_utl.c index e03023454..e03023454 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3_utl.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3_utl.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3conf.c b/drivers/builtin_openssl2/crypto/x509v3/v3conf.c index a9e6ca354..a9e6ca354 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3conf.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3conf.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3err.c b/drivers/builtin_openssl2/crypto/x509v3/v3err.c index f9f6f1f91..f9f6f1f91 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3err.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3err.c diff --git a/drivers/builtin_openssl/crypto/x509v3/v3prin.c b/drivers/builtin_openssl2/crypto/x509v3/v3prin.c index d5ff26829..d5ff26829 100644 --- a/drivers/builtin_openssl/crypto/x509v3/v3prin.c +++ b/drivers/builtin_openssl2/crypto/x509v3/v3prin.c |