diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-03-07 13:34:51 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-03-07 13:34:51 +0000 |
| commit | 63b825c9d46ca3cdbb6ee5f0763d08a734b80e4e (patch) | |
| tree | b70c2fa7077f153c956f25ff1279450b1401ce43 /crypto/rsa/rsa.h | |
| parent | 77f4b6ba4fb9bed18170cc0c4c763c418372ee0c (diff) | |
| download | openssl-63b825c9d46ca3cdbb6ee5f0763d08a734b80e4e.tar.gz | |
add separate PSS decode function, rename PSS parameters to RSA_PSS_PARAMS
Diffstat (limited to 'crypto/rsa/rsa.h')
| -rw-r--r-- | crypto/rsa/rsa.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h index e3565155ed..06cda223c7 100644 --- a/crypto/rsa/rsa.h +++ b/crypto/rsa/rsa.h @@ -241,6 +241,7 @@ struct rsa_st #define EVP_PKEY_CTRL_RSA_KEYGEN_BITS (EVP_PKEY_ALG_CTRL + 3) #define EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP (EVP_PKEY_ALG_CTRL + 4) +#define EVP_PKEY_CTRL_MGF1_MD (EVP_PKEY_ALG_CTRL + 5) #define RSA_PKCS1_PADDING 1 #define RSA_SSLV23_PADDING 2 @@ -300,15 +301,15 @@ const RSA_METHOD *RSA_null_method(void); DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPublicKey) DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPrivateKey) -typedef struct rsassaPssParams_st +typedef struct rsa_pss_params_st { X509_ALGOR *hashAlgorithm; X509_ALGOR *maskGenAlgorithm; ASN1_INTEGER *saltLength; ASN1_INTEGER *trailerField; - } RSASSA_PSS_PARAMS; + } RSA_PSS_PARAMS; -DECLARE_ASN1_FUNCTIONS(RSASSA_PSS_PARAMS) +DECLARE_ASN1_FUNCTIONS(RSA_PSS_PARAMS) #ifndef OPENSSL_NO_FP_API int RSA_print_fp(FILE *fp, const RSA *r,int offset); |