Commit 4e8ba747 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PSS ASN.1 method 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2177)
parent ffc6fad5

crypto/asn1/standard_methods.h

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = { 
#ifndef OPENSSL_NO_CMAC

    &cmac_asn1_meth,

#endif

#ifndef OPENSSL_NO_RSA

    &rsa_pss_asn1_meth,

#endif

#ifndef OPENSSL_NO_DH

    &dhx_asn1_meth,

#endif

crypto/include/internal/asn1_int.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth; 
extern const EVP_PKEY_ASN1_METHOD ecx25519_asn1_meth;

extern const EVP_PKEY_ASN1_METHOD hmac_asn1_meth;

extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[2];

extern const EVP_PKEY_ASN1_METHOD rsa_pss_asn1_meth;



/*

 * These are used internally in the ASN1_OBJECT to keep track of whether the

crypto/rsa/rsa_ameth.c

+31 −0
Original line number Diff line number Diff line
@@ -836,3 +836,34 @@ const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[2] = { 
     EVP_PKEY_RSA,

     ASN1_PKEY_ALIAS}

};



const EVP_PKEY_ASN1_METHOD rsa_pss_asn1_meth = {

     EVP_PKEY_RSA_PSS,

     EVP_PKEY_RSA_PSS,

     ASN1_PKEY_SIGPARAM_NULL,



     "RSA-PSS",

     "OpenSSL RSA-PSS method",



     rsa_pub_decode,

     rsa_pub_encode,

     rsa_pub_cmp,

     rsa_pub_print,



     rsa_priv_decode,

     rsa_priv_encode,

     rsa_priv_print,



     int_rsa_size,

     rsa_bits,

     rsa_security_bits,



     0, 0, 0, 0, 0, 0,



     rsa_sig_print,

     int_rsa_free,

     rsa_pkey_ctrl,

     0, 0,

     rsa_item_verify,

     rsa_item_sign,

};