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> Reviewed-by: Dr Stephen N Henson <shenson@drh-consultancy.co.uk> This is not meant as final patch. - + Upstream-Status: Backport [debian] +Signed-off-by: Armin Kuster <akuster@mvista.com> -Index: openssl-1.0.2/crypto/x509/x509_vfy.c +Index: openssl-1.0.2g/crypto/x509/x509_vfy.c =================================================================== ---- openssl-1.0.2.orig/crypto/x509/x509_vfy.c -+++ openssl-1.0.2/crypto/x509/x509_vfy.c +--- openssl-1.0.2g.orig/crypto/x509/x509_vfy.c ++++ openssl-1.0.2g/crypto/x509/x509_vfy.c @@ -119,6 +119,7 @@ static int check_trust(X509_STORE_CTX *c static int check_revocation(X509_STORE_CTX *ctx); static int check_cert(X509_STORE_CTX *ctx); @@ -25,17 +26,17 @@ Index: openssl-1.0.2/crypto/x509/x509_vfy.c static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer, unsigned int *preasons, X509_CRL *crl, X509 *x); -@@ -438,6 +439,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx +@@ -489,6 +490,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx if (!ok) - goto end; + goto err; + ok = check_ca_blacklist(ctx); -+ if(!ok) goto end; ++ if(!ok) goto err; + #ifndef OPENSSL_NO_RFC3779 /* RFC 3779 path validation, now that CRL check has been done */ ok = v3_asid_validate_path(ctx); -@@ -938,6 +942,29 @@ static int check_crl_time(X509_STORE_CTX +@@ -996,6 +1000,29 @@ static int check_crl_time(X509_STORE_CTX return 1; } |