diff options
Diffstat (limited to 'src/lib/libcrypto/rsa/rsa_asn1.c')
-rw-r--r-- | src/lib/libcrypto/rsa/rsa_asn1.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_asn1.c b/src/lib/libcrypto/rsa/rsa_asn1.c index 4efca8cdc8..6ed5de3db4 100644 --- a/src/lib/libcrypto/rsa/rsa_asn1.c +++ b/src/lib/libcrypto/rsa/rsa_asn1.c | |||
@@ -60,6 +60,7 @@ | |||
60 | #include "cryptlib.h" | 60 | #include "cryptlib.h" |
61 | #include <openssl/bn.h> | 61 | #include <openssl/bn.h> |
62 | #include <openssl/rsa.h> | 62 | #include <openssl/rsa.h> |
63 | #include <openssl/x509.h> | ||
63 | #include <openssl/asn1t.h> | 64 | #include <openssl/asn1t.h> |
64 | 65 | ||
65 | /* Override the default free and new methods */ | 66 | /* Override the default free and new methods */ |
@@ -96,6 +97,15 @@ ASN1_SEQUENCE_cb(RSAPublicKey, rsa_cb) = { | |||
96 | ASN1_SIMPLE(RSA, e, BIGNUM), | 97 | ASN1_SIMPLE(RSA, e, BIGNUM), |
97 | } ASN1_SEQUENCE_END_cb(RSA, RSAPublicKey) | 98 | } ASN1_SEQUENCE_END_cb(RSA, RSAPublicKey) |
98 | 99 | ||
100 | ASN1_SEQUENCE(RSA_PSS_PARAMS) = { | ||
101 | ASN1_EXP_OPT(RSA_PSS_PARAMS, hashAlgorithm, X509_ALGOR,0), | ||
102 | ASN1_EXP_OPT(RSA_PSS_PARAMS, maskGenAlgorithm, X509_ALGOR,1), | ||
103 | ASN1_EXP_OPT(RSA_PSS_PARAMS, saltLength, ASN1_INTEGER,2), | ||
104 | ASN1_EXP_OPT(RSA_PSS_PARAMS, trailerField, ASN1_INTEGER,3) | ||
105 | } ASN1_SEQUENCE_END(RSA_PSS_PARAMS) | ||
106 | |||
107 | IMPLEMENT_ASN1_FUNCTIONS(RSA_PSS_PARAMS) | ||
108 | |||
99 | IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(RSA, RSAPrivateKey, RSAPrivateKey) | 109 | IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(RSA, RSAPrivateKey, RSAPrivateKey) |
100 | 110 | ||
101 | IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(RSA, RSAPublicKey, RSAPublicKey) | 111 | IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(RSA, RSAPublicKey, RSAPublicKey) |