diff options
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_diginotar.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_diginotar.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_diginotar.patch b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_diginotar.patch index 0c1a0b651f..d81e22cd8d 100644 --- a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_diginotar.patch +++ b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_diginotar.patch | |||
@@ -9,14 +9,15 @@ Reviewed-by: Kurt Roeckx <kurt@roeckx.be> | |||
9 | Reviewed-by: Dr Stephen N Henson <shenson@drh-consultancy.co.uk> | 9 | Reviewed-by: Dr Stephen N Henson <shenson@drh-consultancy.co.uk> |
10 | 10 | ||
11 | This is not meant as final patch. | 11 | This is not meant as final patch. |
12 | 12 | ||
13 | Upstream-Status: Backport [debian] | 13 | Upstream-Status: Backport [debian] |
14 | 14 | ||
15 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
15 | 16 | ||
16 | Index: openssl-1.0.2/crypto/x509/x509_vfy.c | 17 | Index: openssl-1.0.2g/crypto/x509/x509_vfy.c |
17 | =================================================================== | 18 | =================================================================== |
18 | --- openssl-1.0.2.orig/crypto/x509/x509_vfy.c | 19 | --- openssl-1.0.2g.orig/crypto/x509/x509_vfy.c |
19 | +++ openssl-1.0.2/crypto/x509/x509_vfy.c | 20 | +++ openssl-1.0.2g/crypto/x509/x509_vfy.c |
20 | @@ -119,6 +119,7 @@ static int check_trust(X509_STORE_CTX *c | 21 | @@ -119,6 +119,7 @@ static int check_trust(X509_STORE_CTX *c |
21 | static int check_revocation(X509_STORE_CTX *ctx); | 22 | static int check_revocation(X509_STORE_CTX *ctx); |
22 | static int check_cert(X509_STORE_CTX *ctx); | 23 | static int check_cert(X509_STORE_CTX *ctx); |
@@ -25,17 +26,17 @@ Index: openssl-1.0.2/crypto/x509/x509_vfy.c | |||
25 | 26 | ||
26 | static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer, | 27 | static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer, |
27 | unsigned int *preasons, X509_CRL *crl, X509 *x); | 28 | unsigned int *preasons, X509_CRL *crl, X509 *x); |
28 | @@ -438,6 +439,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx | 29 | @@ -489,6 +490,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx |
29 | if (!ok) | 30 | if (!ok) |
30 | goto end; | 31 | goto err; |
31 | 32 | ||
32 | + ok = check_ca_blacklist(ctx); | 33 | + ok = check_ca_blacklist(ctx); |
33 | + if(!ok) goto end; | 34 | + if(!ok) goto err; |
34 | + | 35 | + |
35 | #ifndef OPENSSL_NO_RFC3779 | 36 | #ifndef OPENSSL_NO_RFC3779 |
36 | /* RFC 3779 path validation, now that CRL check has been done */ | 37 | /* RFC 3779 path validation, now that CRL check has been done */ |
37 | ok = v3_asid_validate_path(ctx); | 38 | ok = v3_asid_validate_path(ctx); |
38 | @@ -938,6 +942,29 @@ static int check_crl_time(X509_STORE_CTX | 39 | @@ -996,6 +1000,29 @@ static int check_crl_time(X509_STORE_CTX |
39 | return 1; | 40 | return 1; |
40 | } | 41 | } |
41 | 42 | ||