diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2013-07-17 18:05:43 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-07-17 21:45:00 +0100 |
| commit | 8d6a75dc3afda168482f7f8a4cbd778969897656 (patch) | |
| tree | 51e4ede52dd97d7318fc37dbebe1523bed1715aa /crypto | |
| parent | 190c615d4398cc6c8b61eb7881d7409314529a75 (diff) | |
Avoid need to change function code.
Keep original function names for nonce versions so we don't have to change
error function codes.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/dsa/dsa_ossl.c | 14 | ||||
| -rw-r--r-- | crypto/ecdsa/ecs_ossl.c | 18 |
2 files changed, 16 insertions, 16 deletions
diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c index fb82c16d01..edaee59877 100644 --- a/crypto/dsa/dsa_ossl.c +++ b/crypto/dsa/dsa_ossl.c @@ -72,8 +72,8 @@ #endif static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa); -static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp); -static int dsa_sign_setup_with_digest(DSA *dsa, BN_CTX *ctx_in, +static int dsa_sign_setup_no_digest(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp); +static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp, const unsigned char *dgst, int dlen); static int dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig, @@ -84,7 +84,7 @@ static int dsa_finish(DSA *dsa); static DSA_METHOD openssl_dsa_meth = { "OpenSSL DSA method", dsa_do_sign, -dsa_sign_setup, +dsa_sign_setup_no_digest, dsa_do_verify, NULL, /* dsa_mod_exp, */ NULL, /* dsa_bn_mod_exp, */ @@ -179,7 +179,7 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa) redo: if ((dsa->kinv == NULL) || (dsa->r == NULL)) { - if (!dsa_sign_setup_with_digest(dsa,ctx,&kinv,&r,dgst,dlen)) + if (!dsa_sign_setup(dsa,ctx,&kinv,&r,dgst,dlen)) goto err; } else @@ -239,12 +239,12 @@ err: return(ret); } -static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, +static int dsa_sign_setup_no_digest(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp) { - return dsa_sign_setup_with_digest(dsa, ctx_in, kinvp, rp, NULL, 0); + return dsa_sign_setup(dsa, ctx_in, kinvp, rp, NULL, 0); } -static int dsa_sign_setup_with_digest(DSA *dsa, BN_CTX *ctx_in, +static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp, const unsigned char *dgst, int dlen) { diff --git a/crypto/ecdsa/ecs_ossl.c b/crypto/ecdsa/ecs_ossl.c index 9f7aecf5ee..adab1f74b4 100644 --- a/crypto/ecdsa/ecs_ossl.c +++ b/crypto/ecdsa/ecs_ossl.c @@ -66,9 +66,9 @@ static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dlen, const BIGNUM *, const BIGNUM *, EC_KEY *eckey); -static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp, - BIGNUM **rp); -static int ecdsa_sign_setup_with_digest(EC_KEY *eckey, BN_CTX *ctx_in, +static int ecdsa_sign_setup_no_digest(EC_KEY *eckey, + BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp); +static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp, const unsigned char *dgst, int dlen); static int ecdsa_do_verify(const unsigned char *dgst, int dgst_len, @@ -77,7 +77,7 @@ static int ecdsa_do_verify(const unsigned char *dgst, int dgst_len, static ECDSA_METHOD openssl_ecdsa_meth = { "OpenSSL ECDSA method", ecdsa_do_sign, - ecdsa_sign_setup, + ecdsa_sign_setup_no_digest, ecdsa_do_verify, #if 0 NULL, /* init */ @@ -92,12 +92,12 @@ const ECDSA_METHOD *ECDSA_OpenSSL(void) return &openssl_ecdsa_meth; } -static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp, - BIGNUM **rp) { - return ecdsa_sign_setup_with_digest(eckey, ctx_in, kinvp, rp, NULL, 0); +static int ecdsa_sign_setup_no_digest(EC_KEY *eckey, + BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp) { + return ecdsa_sign_setup(eckey, ctx_in, kinvp, rp, NULL, 0); } -static int ecdsa_sign_setup_with_digest(EC_KEY *eckey, BN_CTX *ctx_in, +static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp, const unsigned char *dgst, int dlen) { @@ -327,7 +327,7 @@ static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dgst_len, { if (in_kinv == NULL || in_r == NULL) { - if (!ecdsa_sign_setup_with_digest( + if (!ecdsa_sign_setup( eckey, ctx, &kinv, &ret->r, dgst, dgst_len)) { ECDSAerr(ECDSA_F_ECDSA_DO_SIGN,ERR_R_ECDSA_LIB); |