diff options
| author | Konrad Lipinski <k.lipinski2@samsung.com> | 2019-07-22 18:20:09 +0200 |
|---|---|---|
| committer | Konrad Lipinski <k.lipinski2@samsung.com> | 2019-08-01 14:54:38 +0200 |
| commit | 8ebee53b1dd1fc005ec1f27652b35abd56202a32 (patch) | |
| tree | 7f4ff1146605a2fee5fa55c3bc2732f0f53c18dc /src/openssl | |
| parent | cc6febdd37186eeea33bcbce89d79f661ee0009f (diff) | |
| download | xmlsec1-8ebee53b1dd1fc005ec1f27652b35abd56202a32.tar.gz xmlsec1-8ebee53b1dd1fc005ec1f27652b35abd56202a32.tar.bz2 xmlsec1-8ebee53b1dd1fc005ec1f27652b35abd56202a32.zip | |
Adjust upstream c4d0493d545b99194eea1b2b058930d5a9bb91b1 (1.2.28) to Tizenupstream/1.2.28
Change-Id: Id22df649ea95852ef01b6077beb90b31809004d0
Diffstat (limited to 'src/openssl')
| -rw-r--r-- | src/openssl/digests.c | 4 | ||||
| -rw-r--r-- | src/openssl/x509vfy.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/openssl/digests.c b/src/openssl/digests.c index 537a7399..d27cf8d5 100644 --- a/src/openssl/digests.c +++ b/src/openssl/digests.c @@ -272,14 +272,14 @@ xmlSecOpenSSLEvpDigestVerify(xmlSecTransformPtr transform, xmlSecInvalidSizeError("Digest", dataSize, ctx->dgstSize, xmlSecTransformGetName(transform)); transform->status = xmlSecTransformStatusFail; - return(0); + return -1; } if(memcmp(ctx->dgst, data, ctx->dgstSize) != 0) { xmlSecInvalidDataError("data and digest do not match", xmlSecTransformGetName(transform)); transform->status = xmlSecTransformStatusFail; - return(0); + return -1; } transform->status = xmlSecTransformStatusOk; diff --git a/src/openssl/x509vfy.c b/src/openssl/x509vfy.c index 2e54f136..a6200773 100644 --- a/src/openssl/x509vfy.c +++ b/src/openssl/x509vfy.c @@ -331,6 +331,11 @@ xmlSecOpenSSLX509StoreVerify(xmlSecKeyDataStorePtr store, XMLSEC_STACK_OF_X509* err = X509_STORE_CTX_get_error(xsc); X509_STORE_CTX_cleanup (xsc); + if(ret != 1 && keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_ALLOW_BROKEN_CHAIN){ + ret = 1; + keyInfoCtx->flags2 |= XMLSEC_KEYINFO_ERROR_FLAGS_BROKEN_CHAIN; + } + if(ret == 1) { res = cert; |