6745a1ff32
Store hash algorithm used for MGF1 masks in PSS and OAEP modes in PSS and OAEP parameter structure: this avoids the need to decode part of the ASN.1 structure every time it is used. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2177)
103 lines
3.2 KiB
C
103 lines
3.2 KiB
C
/*
|
|
* Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the OpenSSL license (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 <stdio.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/bn.h>
|
|
#include <openssl/x509.h>
|
|
#include <openssl/asn1t.h>
|
|
#include "rsa_locl.h"
|
|
|
|
/* Override the default free and new methods */
|
|
static int rsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
|
|
void *exarg)
|
|
{
|
|
if (operation == ASN1_OP_NEW_PRE) {
|
|
*pval = (ASN1_VALUE *)RSA_new();
|
|
if (*pval != NULL)
|
|
return 2;
|
|
return 0;
|
|
} else if (operation == ASN1_OP_FREE_PRE) {
|
|
RSA_free((RSA *)*pval);
|
|
*pval = NULL;
|
|
return 2;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
ASN1_SEQUENCE_cb(RSAPrivateKey, rsa_cb) = {
|
|
ASN1_SIMPLE(RSA, version, LONG),
|
|
ASN1_SIMPLE(RSA, n, BIGNUM),
|
|
ASN1_SIMPLE(RSA, e, BIGNUM),
|
|
ASN1_SIMPLE(RSA, d, CBIGNUM),
|
|
ASN1_SIMPLE(RSA, p, CBIGNUM),
|
|
ASN1_SIMPLE(RSA, q, CBIGNUM),
|
|
ASN1_SIMPLE(RSA, dmp1, CBIGNUM),
|
|
ASN1_SIMPLE(RSA, dmq1, CBIGNUM),
|
|
ASN1_SIMPLE(RSA, iqmp, CBIGNUM)
|
|
} ASN1_SEQUENCE_END_cb(RSA, RSAPrivateKey)
|
|
|
|
|
|
ASN1_SEQUENCE_cb(RSAPublicKey, rsa_cb) = {
|
|
ASN1_SIMPLE(RSA, n, BIGNUM),
|
|
ASN1_SIMPLE(RSA, e, BIGNUM),
|
|
} ASN1_SEQUENCE_END_cb(RSA, RSAPublicKey)
|
|
|
|
/* Free up maskHash */
|
|
static int rsa_pss_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
|
|
void *exarg)
|
|
{
|
|
if (operation == ASN1_OP_FREE_PRE) {
|
|
RSA_PSS_PARAMS *pss = (RSA_PSS_PARAMS *)*pval;
|
|
X509_ALGOR_free(pss->maskHash);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
ASN1_SEQUENCE_cb(RSA_PSS_PARAMS, rsa_pss_cb) = {
|
|
ASN1_EXP_OPT(RSA_PSS_PARAMS, hashAlgorithm, X509_ALGOR,0),
|
|
ASN1_EXP_OPT(RSA_PSS_PARAMS, maskGenAlgorithm, X509_ALGOR,1),
|
|
ASN1_EXP_OPT(RSA_PSS_PARAMS, saltLength, ASN1_INTEGER,2),
|
|
ASN1_EXP_OPT(RSA_PSS_PARAMS, trailerField, ASN1_INTEGER,3)
|
|
} ASN1_SEQUENCE_END_cb(RSA_PSS_PARAMS, RSA_PSS_PARAMS)
|
|
|
|
IMPLEMENT_ASN1_FUNCTIONS(RSA_PSS_PARAMS)
|
|
|
|
/* Free up maskHash */
|
|
static int rsa_oaep_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
|
|
void *exarg)
|
|
{
|
|
if (operation == ASN1_OP_FREE_PRE) {
|
|
RSA_OAEP_PARAMS *oaep = (RSA_OAEP_PARAMS *)*pval;
|
|
X509_ALGOR_free(oaep->maskHash);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
ASN1_SEQUENCE_cb(RSA_OAEP_PARAMS, rsa_oaep_cb) = {
|
|
ASN1_EXP_OPT(RSA_OAEP_PARAMS, hashFunc, X509_ALGOR, 0),
|
|
ASN1_EXP_OPT(RSA_OAEP_PARAMS, maskGenFunc, X509_ALGOR, 1),
|
|
ASN1_EXP_OPT(RSA_OAEP_PARAMS, pSourceFunc, X509_ALGOR, 2),
|
|
} ASN1_SEQUENCE_END_cb(RSA_OAEP_PARAMS, RSA_OAEP_PARAMS)
|
|
|
|
IMPLEMENT_ASN1_FUNCTIONS(RSA_OAEP_PARAMS)
|
|
|
|
IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(RSA, RSAPrivateKey, RSAPrivateKey)
|
|
|
|
IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(RSA, RSAPublicKey, RSAPublicKey)
|
|
|
|
RSA *RSAPublicKey_dup(RSA *rsa)
|
|
{
|
|
return ASN1_item_dup(ASN1_ITEM_rptr(RSAPublicKey), rsa);
|
|
}
|
|
|
|
RSA *RSAPrivateKey_dup(RSA *rsa)
|
|
{
|
|
return ASN1_item_dup(ASN1_ITEM_rptr(RSAPrivateKey), rsa);
|
|
}
|