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 2018/10/11 15:39:30 UTC
svn commit: r1843566 -
/santuario/xml-security-cpp/trunk/xsec/enc/XSECKeyInfoResolverDefault.cpp
Author: scantor
Date: Thu Oct 11 15:39:30 2018
New Revision: 1843566
URL: http://svn.apache.org/viewvc?rev=1843566&view=rev
Log:
SANTUARIO-496 - Prevent KeyInfoResolver returning NONE keys.
Modified:
santuario/xml-security-cpp/trunk/xsec/enc/XSECKeyInfoResolverDefault.cpp
Modified: santuario/xml-security-cpp/trunk/xsec/enc/XSECKeyInfoResolverDefault.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/XSECKeyInfoResolverDefault.cpp?rev=1843566&r1=1843565&r2=1843566&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/XSECKeyInfoResolverDefault.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/XSECKeyInfoResolverDefault.cpp Thu Oct 11 15:39:30 2018
@@ -105,7 +105,7 @@ XSECCryptoKey* XSECKeyInfoResolverDefaul
const DSIGKeyInfoValue* dsaval = (const DSIGKeyInfoValue *) lst->item(i);
if (dsaval->getDSAP() || dsaval->getDSAQ() || dsaval->getDSAG() || dsaval->getDSAY()) {
- XSECCryptoKeyDSA * dsa = XSECPlatformUtils::g_cryptoProvider->keyDSA();
+ XSECCryptoKeyDSA* dsa = XSECPlatformUtils::g_cryptoProvider->keyDSA();
Janitor<XSECCryptoKeyDSA> j_dsa(dsa);
safeBuffer value;
@@ -127,8 +127,10 @@ XSECCryptoKey* XSECKeyInfoResolverDefaul
dsa->loadYBase64BigNums(value.rawCharBuffer(), (unsigned int) strlen(value.rawCharBuffer()));
}
- j_dsa.release();
- return dsa;
+ if (dsa->getKeyType() != XSECCryptoKey::KEY_NONE) {
+ j_dsa.release();
+ return dsa;
+ }
}
}
break;
@@ -148,8 +150,10 @@ XSECCryptoKey* XSECKeyInfoResolverDefaul
value << (*mp_formatter << rsaval->getRSAExponent());
rsa->loadPublicExponentBase64BigNums(value.rawCharBuffer(), (unsigned int) strlen(value.rawCharBuffer()));
- j_rsa.release();
- return rsa;
+ if (rsa->getKeyType() != XSECCryptoKey::KEY_NONE) {
+ j_rsa.release();
+ return rsa;
+ }
}
}
@@ -169,8 +173,10 @@ XSECCryptoKey* XSECKeyInfoResolverDefaul
XSECAutoPtrChar curve(ecval->getECNamedCurve());
if (curve.get()) {
ec->loadPublicKeyBase64(curve.get(), value.rawCharBuffer(), (unsigned int) strlen(value.rawCharBuffer()));
- j_ec.release();
- return ec;
+ if (ec->getKeyType() != XSECCryptoKey::KEY_NONE) {
+ j_ec.release();
+ return ec;
+ }
}
}
}
@@ -184,7 +190,11 @@ XSECCryptoKey* XSECKeyInfoResolverDefaul
safeBuffer value;
value << (*mp_formatter << derval->getData());
- return XSECPlatformUtils::g_cryptoProvider->keyDER(value.rawCharBuffer(), (unsigned int)strlen(value.rawCharBuffer()), true);
+ XSECCryptoKey* key = XSECPlatformUtils::g_cryptoProvider->keyDER(value.rawCharBuffer(), (unsigned int)strlen(value.rawCharBuffer()), true);
+ if (key && key->getKeyType() != XSECCryptoKey::KEY_NONE) {
+ return key;
+ }
+ delete key;
}
}
break;