bbde856619
Fixes #13969 - properly handle the mandatory RSA-PSS key parameters - improve parameter checking when setting the parameters - compute the algorithm id at the time it is requested so it reflects the actual parameters set - when generating keys do not override previously set parameters with defaults - tests added to the test_req recipe that should cover the PSS signature handling Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/13988)
65 lines
2.4 KiB
C
65 lines
2.4 KiB
C
/*
|
|
* Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <openssl/obj_mac.h>
|
|
#include "internal/packet.h"
|
|
#include "prov/der_rsa.h"
|
|
#include "prov/der_digests.h"
|
|
|
|
/* Aliases so we can have a uniform MD_with_RSA_CASE */
|
|
#define ossl_der_oid_sha3_224WithRSAEncryption \
|
|
ossl_der_oid_id_rsassa_pkcs1_v1_5_with_sha3_224
|
|
#define ossl_der_oid_sha3_256WithRSAEncryption \
|
|
ossl_der_oid_id_rsassa_pkcs1_v1_5_with_sha3_256
|
|
#define ossl_der_oid_sha3_384WithRSAEncryption \
|
|
ossl_der_oid_id_rsassa_pkcs1_v1_5_with_sha3_384
|
|
#define ossl_der_oid_sha3_512WithRSAEncryption \
|
|
ossl_der_oid_id_rsassa_pkcs1_v1_5_with_sha3_512
|
|
|
|
#define MD_with_RSA_CASE(name, var) \
|
|
case NID_##name: \
|
|
var = ossl_der_oid_##name##WithRSAEncryption; \
|
|
var##_sz = sizeof(ossl_der_oid_##name##WithRSAEncryption); \
|
|
break;
|
|
|
|
int ossl_DER_w_algorithmIdentifier_MDWithRSAEncryption(WPACKET *pkt, int tag,
|
|
int mdnid)
|
|
{
|
|
const unsigned char *precompiled = NULL;
|
|
size_t precompiled_sz = 0;
|
|
|
|
switch (mdnid) {
|
|
#ifndef FIPS_MODULE
|
|
MD_with_RSA_CASE(md2, precompiled);
|
|
MD_with_RSA_CASE(md5, precompiled);
|
|
MD_with_RSA_CASE(md4, precompiled);
|
|
MD_with_RSA_CASE(ripemd160, precompiled);
|
|
/* TODO(3.0) Decide what to do about mdc2 and md5_sha1 */
|
|
#endif
|
|
MD_with_RSA_CASE(sha1, precompiled);
|
|
MD_with_RSA_CASE(sha224, precompiled);
|
|
MD_with_RSA_CASE(sha256, precompiled);
|
|
MD_with_RSA_CASE(sha384, precompiled);
|
|
MD_with_RSA_CASE(sha512, precompiled);
|
|
MD_with_RSA_CASE(sha512_224, precompiled);
|
|
MD_with_RSA_CASE(sha512_256, precompiled);
|
|
MD_with_RSA_CASE(sha3_224, precompiled);
|
|
MD_with_RSA_CASE(sha3_256, precompiled);
|
|
MD_with_RSA_CASE(sha3_384, precompiled);
|
|
MD_with_RSA_CASE(sha3_512, precompiled);
|
|
default:
|
|
return 0;
|
|
}
|
|
|
|
return ossl_DER_w_begin_sequence(pkt, tag)
|
|
/* No parameters (yet?) */
|
|
&& ossl_DER_w_precompiled(pkt, -1, precompiled, precompiled_sz)
|
|
&& ossl_DER_w_end_sequence(pkt, tag);
|
|
}
|