Skip to content

Commit

Permalink
(xmlsec-openssl) Fixed excess padding in ECDSA signature generation (#…
Browse files Browse the repository at this point in the history 
…871)
  • Loading branch information
@lsh123
lsh123 authored Jan 30, 2025
1 parent c61a4a9 commit 3fe3cd1
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 21 deletions.
4 changes: 3 additions & 1 deletion docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,10 @@ <h1>XML Security Library</h1>
<li>(xmlsec-core) Added XMLSEC_TRANSFORM_FLAGS_USER_SPECIFIED flag to the xmlSecTransform to differentiate transforms specified in the input XML file vs transforms automatically added by XMLSec library.</li>
<li>(xmlsec-core) Added signature result verification to the examples to demonstrate the need to ensure the correct data is actually signed.</li>
<li>(xmlsec-core) Disabled old crypto algorithms (MD5, RIPEMD160) and the old crypto engines (MSCrypto, GCrypt) by default (use "--with-legacy-features" option to reenable everything).</li>
<li>(xmlsec-windows) Disabled old crypto algorithms (MD5, RIPEMD160), made "mscng" the default crypto engine on Windows, and added support for "legacy-features" flag for "configure.js".<li>
<li>(xmlsec-openssl) Fixed excess padding in ECDSA signature generation.</li>
<li>(xmlsec-nss) Fixed certificates search in NSS DB.</li>
<li>(xmlsec-openssl, xmlsec-gnutls, xmlsec-mscng) Added an option to skip timestamp checks for certificates and CLRs.</li>
<li>(xmlsec-windows) Disabled old crypto algorithms (MD5, RIPEMD160), made "mscng" the default crypto engine on Windows, and added support for "legacy-features" flag for "configure.js".<li>
<li>Several other small fixes (see <a href="https://github.com/lsh123/xmlsec/commits/master">more details</a>).</li>
</ul>
</li>
Expand Down
4 changes: 2 additions & 2 deletions src/keys.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -826,9 +826,9 @@ xmlSecKeySetValue(xmlSecKeyPtr key, xmlSecKeyDataPtr value) {
* xmlSecKeyGetSize:
* @key: the pointer to key.
*
* Gets key size (see also #xmlSecKeyDataGetSize function).
* Gets key size (in bits). Also see #xmlSecKeyDataGetSize function.
*
* Returns: key size.
* Returns: key size (in bits).
*/
xmlSecSize
xmlSecKeyGetSize(xmlSecKeyPtr key) {
Expand Down
2 changes: 1 addition & 1 deletion src/keysdata.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ xmlSecKeyDataGetType(xmlSecKeyDataPtr data) {
* xmlSecKeyDataGetSize:
* @data: the pointer to key data.
*
* Gets key data size.
* Gets key data size (in bits).
*
* Returns: key data size (in bits).
*/
Expand Down
34 changes: 17 additions & 17 deletions src/openssl/signatures.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ struct _xmlSecOpenSSLEvpSignatureCtx {
EVP_MD_CTX* digestCtx;
xmlSecKeyDataId keyId;
EVP_PKEY* pKey;
xmlSecSize keySize;
xmlSecSize keySizeBits;
xmlSecOpenSSLEvpSignatureMode mode;
int rsaPadding;
};
Expand All @@ -101,12 +101,12 @@ static int xmlSecOpenSSLEvpSignatureDsa_OpenSSL2XmlDSig (const xmlSecTra
#endif /* XMLSEC_NO_DSA */

#ifndef XMLSEC_NO_EC
static int xmlSecOpenSSLEvpSignatureEcdsa_XmlDSig2OpenSSL (xmlSecSize keySize,
static int xmlSecOpenSSLEvpSignatureEcdsa_XmlDSig2OpenSSL (xmlSecSize keySizeBits,
const xmlSecByte * data,
xmlSecSize dataSize,
unsigned char ** out,
int * outLen);
static int xmlSecOpenSSLEvpSignatureEcdsa_OpenSSL2XmlDSig (xmlSecSize keySize,
static int xmlSecOpenSSLEvpSignatureEcdsa_OpenSSL2XmlDSig (xmlSecSize keySizeBits,
xmlSecBufferPtr data);
#endif /* XMLSEC_NO_EC */

Expand Down Expand Up @@ -809,8 +809,8 @@ xmlSecOpenSSLEvpSignatureSetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key)
xmlSecAssert2(ctx->keyId != NULL, -1);
xmlSecAssert2(xmlSecKeyCheckId(key, ctx->keyId), -1);

ctx->keySize = xmlSecKeyGetSize(key);
if(ctx->keySize <= 0) {
ctx->keySizeBits = xmlSecKeyGetSize(key);
if(ctx->keySizeBits <= 0) {
xmlSecInternalError("xmlSecKeyGetSize", xmlSecTransformGetName(transform));
return(-1);
}
Expand Down Expand Up @@ -999,7 +999,7 @@ xmlSecOpenSSLEvpSignatureVerify(xmlSecTransformPtr transform,
xmlSecAssert2(ctx->digest != NULL, -1);
xmlSecAssert2(ctx->digestCtx != NULL, -1);
xmlSecAssert2(ctx->pKey != NULL, -1);
xmlSecAssert2(ctx->keySize > 0, -1);
xmlSecAssert2(ctx->keySizeBits > 0, -1);

/* calculate digest */
ret = xmlSecOpenSSLEvpSignatureCalculateDigest(transform, ctx, dgst, &dgstSize);
Expand Down Expand Up @@ -1042,7 +1042,7 @@ xmlSecOpenSSLEvpSignatureVerify(xmlSecTransformPtr transform,
case xmlSecOpenSSLEvpSignatureMode_Ecdsa:
#ifndef XMLSEC_NO_EC
/* convert XMLDSig data to the format expected by OpenSSL */
ret = xmlSecOpenSSLEvpSignatureEcdsa_XmlDSig2OpenSSL(ctx->keySize, data, dataSize, &fixedData, &fixedDataLen);
ret = xmlSecOpenSSLEvpSignatureEcdsa_XmlDSig2OpenSSL(ctx->keySizeBits, data, dataSize, &fixedData, &fixedDataLen);
if((ret < 0) || (fixedData == NULL) || (fixedDataLen <= 0)) {
xmlSecInternalError("xmlSecOpenSSLEvpSignatureEcdsa_XmlDSig2OpenSSL", xmlSecTransformGetName(transform));
goto done;
Expand Down Expand Up @@ -1096,7 +1096,7 @@ xmlSecOpenSSLEvpSignatureSign(xmlSecTransformPtr transform, xmlSecOpenSSLEvpSign
xmlSecAssert2(transform != NULL, -1);
xmlSecAssert2(ctx != NULL, -1);
xmlSecAssert2(ctx->pKey != NULL, -1);
xmlSecAssert2(ctx->keySize > 0, -1);
xmlSecAssert2(ctx->keySizeBits > 0, -1);
xmlSecAssert2(out != NULL, -1);

/* calculate digest */
Expand Down Expand Up @@ -1168,7 +1168,7 @@ xmlSecOpenSSLEvpSignatureSign(xmlSecTransformPtr transform, xmlSecOpenSSLEvpSign
case xmlSecOpenSSLEvpSignatureMode_Ecdsa:
#ifndef XMLSEC_NO_EC
/* convert XMLDSig data to the format expected by OpenSSL */
ret = xmlSecOpenSSLEvpSignatureEcdsa_OpenSSL2XmlDSig(ctx->keySize, out);
ret = xmlSecOpenSSLEvpSignatureEcdsa_OpenSSL2XmlDSig(ctx->keySizeBits, out);
if(ret < 0) {
xmlSecInternalError("xmlSecOpenSSLEvpSignatureEcdsa_OpenSSL2XmlDSig", xmlSecTransformGetName(transform));
goto done;
Expand Down Expand Up @@ -1831,7 +1831,7 @@ xmlSecOpenSSLTransformDsaSha256GetKlass(void) {
#ifndef XMLSEC_NO_EC

static int
xmlSecOpenSSLEvpSignatureEcdsa_XmlDSig2OpenSSL(xmlSecSize keySize, const xmlSecByte * data, xmlSecSize dataSize,
xmlSecOpenSSLEvpSignatureEcdsa_XmlDSig2OpenSSL(xmlSecSize keySizeBits, const xmlSecByte * data, xmlSecSize dataSize,
unsigned char ** out, int * outLen
) {
ECDSA_SIG* sig = NULL;
Expand All @@ -1841,15 +1841,15 @@ xmlSecOpenSSLEvpSignatureEcdsa_XmlDSig2OpenSSL(xmlSecSize keySize, const xmlSecB
int res = -1;
int ret;

xmlSecAssert2(keySize > 0, 0);
xmlSecAssert2(keySizeBits > 0, 0);
xmlSecAssert2(data != NULL, 0);
xmlSecAssert2(dataSize > 0, 0);
xmlSecAssert2(out != NULL, 0);
xmlSecAssert2((*out) == NULL, 0);
xmlSecAssert2(outLen != NULL, 0);

/* get signature size */
XMLSEC_SAFE_CAST_SIZE_TO_INT(keySize, signHalfLen, goto done, NULL);
/* get half of signature size in bytes */
XMLSEC_SAFE_CAST_SIZE_TO_INT((keySizeBits + 7) / 8, signHalfLen, goto done, NULL);

/* check size: we expect the r and s to be the same size and match the size of
* the key (RFC 6931); however some implementations (e.g. Java) cut leading zeros:
Expand Down Expand Up @@ -1914,7 +1914,7 @@ xmlSecOpenSSLEvpSignatureEcdsa_XmlDSig2OpenSSL(xmlSecSize keySize, const xmlSecB
}

static int
xmlSecOpenSSLEvpSignatureEcdsa_OpenSSL2XmlDSig(xmlSecSize keySize, xmlSecBufferPtr data) {
xmlSecOpenSSLEvpSignatureEcdsa_OpenSSL2XmlDSig(xmlSecSize keySizeBits, xmlSecBufferPtr data) {
xmlSecByte * buf;
xmlSecSize bufSize;
int bufLen, signHalfLen, rLen, sLen;
Expand All @@ -1924,16 +1924,16 @@ xmlSecOpenSSLEvpSignatureEcdsa_OpenSSL2XmlDSig(xmlSecSize keySize, xmlSecBufferP
int ret;
int res = -1;

xmlSecAssert2(keySize > 0, 0);
xmlSecAssert2(keySizeBits > 0, 0);
xmlSecAssert2(data != NULL, 0);

buf = xmlSecBufferGetData(data);
bufSize = xmlSecBufferGetSize(data);
xmlSecAssert2(buf != NULL, 0);
xmlSecAssert2(bufSize > 0, 0);

/* get signature size */
XMLSEC_SAFE_CAST_SIZE_TO_INT(keySize, signHalfLen, goto done, NULL);
/* get half of signature size in bytes */
XMLSEC_SAFE_CAST_SIZE_TO_INT((keySizeBits + 7) / 8, signHalfLen, goto done, NULL);

/* extract signature */
XMLSEC_SAFE_CAST_SIZE_TO_INT(bufSize, bufLen, goto done, NULL);
Expand Down

0 comments on commit 3fe3cd1

Please sign in to comment.