diff options
author | Bodo Möller <bodo@openssl.org> | 2002-08-12 12:47:41 +0400 |
---|---|---|
committer | Bodo Möller <bodo@openssl.org> | 2002-08-12 12:47:41 +0400 |
commit | 5488bb6197b9af7a4670fb88936f0b53a9af0d2f (patch) | |
tree | 2ce305909c9ce5d5b2ecd52dd6757138586106b6 /apps | |
parent | 8e28c6715579d2ca7529de7aff257fa03a28bf93 (diff) |
get rid of EVP_PKEY_ECDSA (now we have EVP_PKEY_EC instead)
Submitted by: Nils Larsch
Diffstat (limited to 'apps')
-rw-r--r-- | apps/ca.c | 4 | ||||
-rw-r--r-- | apps/req.c | 5 | ||||
-rw-r--r-- | apps/speed.c | 12 | ||||
-rw-r--r-- | apps/x509.c | 6 |
4 files changed, 16 insertions, 11 deletions
@@ -1515,7 +1515,7 @@ bad: else #endif #ifndef OPENSSL_NO_ECDSA - if (pkey->type == EVP_PKEY_ECDSA) + if (pkey->type == EVP_PKEY_EC) dgst=EVP_ecdsa(); else #endif @@ -2293,7 +2293,7 @@ again2: EVP_PKEY_free(pktmp); #endif #ifndef OPENSSL_NO_ECDSA - if (pkey->type == EVP_PKEY_ECDSA) + if (pkey->type == EVP_PKEY_EC) dgst = EVP_ecdsa(); pktmp = X509_get_pubkey(ret); if (EVP_PKEY_missing_parameters(pktmp) && diff --git a/apps/req.c b/apps/req.c index b6bc85e387..1f24be79bd 100644 --- a/apps/req.c +++ b/apps/req.c @@ -682,7 +682,8 @@ bad: message */ goto end; } - if (EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA || EVP_PKEY_type(pkey->type) == EVP_PKEY_ECDSA) + if (EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA || + EVP_PKEY_type(pkey->type) == EVP_PKEY_EC) { char *randfile = NCONF_get_string(req_conf,SECTION,"RANDFILE"); if (randfile == NULL) @@ -852,7 +853,7 @@ loop: digest=EVP_dss1(); #endif #ifndef OPENSSL_NO_ECDSA - if (pkey->type == EVP_PKEY_ECDSA) + if (pkey->type == EVP_PKEY_EC) digest=EVP_ecdsa(); #endif if (req == NULL) diff --git a/apps/speed.c b/apps/speed.c index 4a77e8af58..abcede337e 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -1937,7 +1937,7 @@ int MAIN(int argc, char **argv) { /* Perform ECDSA signature test */ EC_KEY_generate_key(ecdsa[j]); - ret = ECDSA_sign(EVP_PKEY_ECDSA, buf, 20, ecdsasig, + ret = ECDSA_sign(0, buf, 20, ecdsasig, &ecdsasiglen, ecdsa[j]); if (ret == 0) { @@ -1953,9 +1953,12 @@ int MAIN(int argc, char **argv) ECDSA_SECONDS); Time_F(START); - for (count=0,run=1; COND(ecdsa_c[j][0]); count++) + for (count=0,run=1; COND(ecdsa_c[j][0]); + count++) { - ret=ECDSA_sign(EVP_PKEY_ECDSA, buf, 20, ecdsasig, &ecdsasiglen, ecdsa[j]); + ret=ECDSA_sign(0, buf, 20, + ecdsasig, &ecdsasiglen, + ecdsa[j]); if (ret == 0) { BIO_printf(bio_err, "ECDSA sign failure\n"); @@ -1974,7 +1977,8 @@ int MAIN(int argc, char **argv) } /* Perform ECDSA verification test */ - ret=ECDSA_verify(EVP_PKEY_ECDSA, buf, 20, ecdsasig, ecdsasiglen, ecdsa[j]); + ret=ECDSA_verify(0, buf, 20, ecdsasig, + ecdsasiglen, ecdsa[j]); if (ret != 1) { BIO_printf(bio_err,"ECDSA verify failure. No ECDSA verify will be done.\n"); diff --git a/apps/x509.c b/apps/x509.c index 67476e34cf..aa06462b9f 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -870,7 +870,7 @@ bad: digest=EVP_dss1(); #endif #ifndef OPENSSL_NO_ECDSA - if (Upkey->type == EVP_PKEY_ECDSA) + if (Upkey->type == EVP_PKEY_EC) digest=EVP_ecdsa(); #endif @@ -894,7 +894,7 @@ bad: digest=EVP_dss1(); #endif #ifndef OPENSSL_NO_ECDSA - if (CApkey->type == EVP_PKEY_ECDSA) + if (CApkey->type == EVP_PKEY_EC) digest = EVP_ecdsa(); #endif @@ -929,7 +929,7 @@ bad: digest=EVP_dss1(); #endif #ifndef OPENSSL_NO_ECDSA - if (pk->type == EVP_PKEY_ECDSA) + if (pk->type == EVP_PKEY_EC) digest=EVP_ecdsa(); #endif |