diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-04-12 10:20:47 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-04-12 10:20:47 +0000 |
| commit | c927df3fa19a2afda7bbacefbb366f7382b5269b (patch) | |
| tree | 4acc885a629106c24fae58beba5ec9db078acc5b /crypto/rsa | |
| parent | 4700aea951dcba9b1e3b724bf4d8f0c712578892 (diff) | |
Initial DSA EVP_PKEY_METHOD. Fixup some error codes.
Diffstat (limited to 'crypto/rsa')
| -rw-r--r-- | crypto/rsa/rsa.h | 2 | ||||
| -rw-r--r-- | crypto/rsa/rsa_err.c | 2 | ||||
| -rw-r--r-- | crypto/rsa/rsa_pmeth.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h index cc58797f30..74fcdee259 100644 --- a/crypto/rsa/rsa.h +++ b/crypto/rsa/rsa.h @@ -370,7 +370,7 @@ void ERR_load_RSA_strings(void); /* Error codes for the RSA functions. */ /* Function codes. */ -#define RSA_F_CHECK_PADDING_NID 140 +#define RSA_F_CHECK_PADDING_MD 140 #define RSA_F_MEMORY_LOCK 100 #define RSA_F_PKEY_RSA_SIGN 142 #define RSA_F_PKEY_RSA_VERIFYRECOVER 141 diff --git a/crypto/rsa/rsa_err.c b/crypto/rsa/rsa_err.c index 9afd099f47..cfbbfa8d9d 100644 --- a/crypto/rsa/rsa_err.c +++ b/crypto/rsa/rsa_err.c @@ -70,7 +70,7 @@ static ERR_STRING_DATA RSA_str_functs[]= { -{ERR_FUNC(RSA_F_CHECK_PADDING_NID), "CHECK_PADDING_NID"}, +{ERR_FUNC(RSA_F_CHECK_PADDING_MD), "CHECK_PADDING_MD"}, {ERR_FUNC(RSA_F_MEMORY_LOCK), "MEMORY_LOCK"}, {ERR_FUNC(RSA_F_PKEY_RSA_SIGN), "PKEY_RSA_SIGN"}, {ERR_FUNC(RSA_F_PKEY_RSA_VERIFYRECOVER), "PKEY_RSA_VERIFYRECOVER"}, diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c index 49323bfcee..3eebdf58bf 100644 --- a/crypto/rsa/rsa_pmeth.c +++ b/crypto/rsa/rsa_pmeth.c @@ -127,8 +127,8 @@ static void pkey_rsa_cleanup(EVP_PKEY_CTX *ctx) BN_free(rctx->pub_exp); if (rctx->tbuf) OPENSSL_free(rctx->tbuf); + OPENSSL_free(rctx); } - OPENSSL_free(rctx); } static int pkey_rsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, int *siglen, @@ -330,7 +330,7 @@ static int check_padding_md(const EVP_MD *md, int padding) if (padding == RSA_NO_PADDING) { - RSAerr(RSA_F_CHECK_PADDING_NID, RSA_R_INVALID_PADDING_MODE); + RSAerr(RSA_F_CHECK_PADDING_MD, RSA_R_INVALID_PADDING_MODE); return 0; } @@ -338,7 +338,7 @@ static int check_padding_md(const EVP_MD *md, int padding) { if (RSA_X931_hash_id(EVP_MD_type(md)) == -1) { - RSAerr(RSA_F_CHECK_PADDING_NID, + RSAerr(RSA_F_CHECK_PADDING_MD, RSA_R_INVALID_X931_DIGEST); return 0; } |