You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by sc...@apache.org on 2010/08/21 17:17:11 UTC
svn commit: r987769 - in /xml/security/trunk/c/src/enc/OpenSSL:
OpenSSLCryptoProvider.cpp OpenSSLCryptoProvider.hpp
Author: scantor
Date: Sat Aug 21 15:17:09 2010
New Revision: 987769
URL: http://svn.apache.org/viewvc?rev=987769&view=rev
Log:
Compile out EC support.
Modified:
xml/security/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.cpp
xml/security/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.hpp
Modified: xml/security/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.cpp?rev=987769&r1=987768&r2=987769&view=diff
==============================================================================
--- xml/security/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.cpp (original)
+++ xml/security/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.cpp Sat Aug 21 15:17:09 2010
@@ -60,7 +60,7 @@ OpenSSLCryptoProvider::OpenSSLCryptoProv
ERR_load_crypto_strings();
//SSLeay_add_all_algorithms();
-
+#ifdef XSEC_OPENSSL_HAVE_EC
// Populate curve names.
m_namedCurveMap["urn:oid:1.3.132.0.6"] = NID_secp112r1;
m_namedCurveMap["urn:oid:1.3.132.0.7"] = NID_secp112r2;
@@ -135,6 +135,7 @@ OpenSSLCryptoProvider::OpenSSLCryptoProv
m_namedCurveMap["urn:oid:2.23.43.1.4.10"] = NID_wap_wsg_idm_ecid_wtls10;
m_namedCurveMap["urn:oid:2.23.43.1.4.11"] = NID_wap_wsg_idm_ecid_wtls11;
m_namedCurveMap["urn:oid:2.23.43.1.4.12"] = NID_wap_wsg_idm_ecid_wtls12;
+#endif
}
@@ -151,6 +152,7 @@ OpenSSLCryptoProvider::~OpenSSLCryptoPro
ERR_remove_state(0);
}
+#ifdef XSEC_OPENSSL_HAVE_EC
int OpenSSLCryptoProvider::curveNameToNID(const char* curveName) const {
std::map<std::string,int>::const_iterator i = m_namedCurveMap.find(curveName);
@@ -160,6 +162,7 @@ int OpenSSLCryptoProvider::curveNameToNI
return i->second;
}
+#endif
const XMLCh * OpenSSLCryptoProvider::getProviderName() const {
@@ -278,12 +281,16 @@ XSECCryptoKeyDSA * OpenSSLCryptoProvider
XSECCryptoKeyEC * OpenSSLCryptoProvider::keyEC() const {
+#ifdef XSEC_OPENSSL_HAVE_EC
OpenSSLCryptoKeyEC * ret;
XSECnew(ret, OpenSSLCryptoKeyEC());
return ret;
-
+#else
+ throw XSECCryptoException(XSECCryptoException::UnsupportedError,
+ "OpenSSLCryptoProvider::keyEC - EC support not available");
+#endif
}
XSECCryptoKeyRSA * OpenSSLCryptoProvider::keyRSA() const {
Modified: xml/security/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.hpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.hpp?rev=987769&r1=987768&r2=987769&view=diff
==============================================================================
--- xml/security/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.hpp (original)
+++ xml/security/trunk/c/src/enc/OpenSSL/OpenSSLCryptoProvider.hpp Sat Aug 21 15:17:09 2010
@@ -52,7 +52,9 @@
class DSIG_EXPORT OpenSSLCryptoProvider : public XSECCryptoProvider {
+#ifdef XSEC_OPENSSL_HAVE_EC
std::map<std::string,int> m_namedCurveMap;
+#endif
public :
@@ -286,6 +288,7 @@ public :
virtual unsigned int getRandom(unsigned char * buffer, unsigned int numOctets) const;
+#ifdef XSEC_OPENSSL_HAVE_EC
/**
* \brief Map a curve name (in URI form) to a curve NID.
*
@@ -295,6 +298,7 @@ public :
* @returns the corresponding NID
*/
int curveNameToNID(const char* curveName) const;
+#endif
//@}