projects
/
shibboleth
/
cpp-xmltooling.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
54b24af
)
Check for OpenSSL error code for < 0.9.8
author
Scott Cantor
<cantor.2@osu.edu>
Wed, 11 Jan 2012 18:55:02 +0000
(18:55 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Wed, 11 Jan 2012 18:55:02 +0000
(18:55 +0000)
xmltooling/security/impl/PKIXPathValidator.cpp
patch
|
blob
|
history
diff --git
a/xmltooling/security/impl/PKIXPathValidator.cpp
b/xmltooling/security/impl/PKIXPathValidator.cpp
index
cc9eb45
..
3a86057
100644
(file)
--- a/
xmltooling/security/impl/PKIXPathValidator.cpp
+++ b/
xmltooling/security/impl/PKIXPathValidator.cpp
@@
-406,7
+406,7
@@
bool PKIXPathValidator::validate(X509* EE, STACK_OF(X509)* untrusted, const Path
if (ret == 1) {
m_log.debug("successfully validated certificate chain");
}
if (ret == 1) {
m_log.debug("successfully validated certificate chain");
}
-#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
+#if
defined(X509_V_ERR_NO_EXPLICIT_POLICY) &&
(OPENSSL_VERSION_NUMBER < 0x10000000L)
else if (X509_STORE_CTX_get_error(&ctx) == X509_V_ERR_NO_EXPLICIT_POLICY && !pkixParams->isPolicyMappingInhibited()) {
m_log.warn("policy mapping requires OpenSSL 1.0.0 or later");
}
else if (X509_STORE_CTX_get_error(&ctx) == X509_V_ERR_NO_EXPLICIT_POLICY && !pkixParams->isPolicyMappingInhibited()) {
m_log.warn("policy mapping requires OpenSSL 1.0.0 or later");
}