diff options
| author | sangwan.kwon <sangwan.kwon@samsung.com> | 2016-07-27 15:33:38 +0900 |
|---|---|---|
| committer | sangwan.kwon <sangwan.kwon@samsung.com> | 2016-07-27 15:39:05 +0900 |
| commit | d4d35351fd63a7051a7cbef2002cb0c641925ec3 (patch) | |
| tree | d390d823f40a886547b932f9bd9239fe81ef6056 /src/nss/x509vfy.c | |
| parent | caccc67c33486a1d1b29f227071851961b29a722 (diff) | |
| download | xmlsec1-d4d35351fd63a7051a7cbef2002cb0c641925ec3.tar.gz xmlsec1-d4d35351fd63a7051a7cbef2002cb0c641925ec3.tar.bz2 xmlsec1-d4d35351fd63a7051a7cbef2002cb0c641925ec3.zip | |
Imported Upstream version 1.2.22upstream/1.2.22upstream
Change-Id: I4d17734839f021e46aef7a30483ac17e8c85fb1d
Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>
Diffstat (limited to 'src/nss/x509vfy.c')
| -rw-r--r-- | src/nss/x509vfy.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/nss/x509vfy.c b/src/nss/x509vfy.c index fdb866fe..9e957fea 100644 --- a/src/nss/x509vfy.c +++ b/src/nss/x509vfy.c @@ -233,7 +233,8 @@ xmlSecNssX509StoreVerify(xmlSecKeyDataStorePtr store, CERTCertList* certs, NULL, XMLSEC_ERRORS_R_CERT_ISSUER_FAILED, "cert with subject name %s could not be verified because the issuer's cert is expired/invalid or not found", - cert->subjectName); + (cert != NULL) ? cert->subjectName : "(NULL)" + ); break; case SEC_ERROR_EXPIRED_CERTIFICATE: xmlSecError(XMLSEC_ERRORS_HERE, @@ -241,7 +242,8 @@ xmlSecNssX509StoreVerify(xmlSecKeyDataStorePtr store, CERTCertList* certs, NULL, XMLSEC_ERRORS_R_CERT_HAS_EXPIRED, "cert with subject name %s has expired", - cert->subjectName); + (cert != NULL) ? cert->subjectName : "(NULL)" + ); break; case SEC_ERROR_REVOKED_CERTIFICATE: xmlSecError(XMLSEC_ERRORS_HERE, @@ -249,15 +251,16 @@ xmlSecNssX509StoreVerify(xmlSecKeyDataStorePtr store, CERTCertList* certs, NULL, XMLSEC_ERRORS_R_CERT_REVOKED, "cert with subject name %s has been revoked", - cert->subjectName); + (cert != NULL) ? cert->subjectName : "(NULL)" + ); break; default: xmlSecError(XMLSEC_ERRORS_HERE, xmlSecErrorsSafeString(xmlSecKeyDataStoreGetName(store)), NULL, XMLSEC_ERRORS_R_CERT_VERIFY_FAILED, - "cert with subject name %s could not be verified, errcode %d", - cert->subjectName, + "cert with subject name %s could not be verified, errcode %d", + (cert != NULL) ? cert->subjectName : "(NULL)", PORT_GetError()); break; } @@ -690,11 +693,10 @@ xmlSecNssX509NameRead(xmlSecByte *str, int len) { } memcpy(p, value, valueLen); p+=valueLen; - if (len > 0) + if (len > 0) { *p++=','; + } } - } else { - valueLen = 0; } if(len > 0) { ++str; --len; |