summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/algorithms/publickey.c4
-rw-r--r--lib/algorithms/secparams.c4
-rw-r--r--lib/algorithms/sign.c10
-rw-r--r--lib/auth/cert.c2
-rw-r--r--lib/auth/ecdh_common.c8
-rw-r--r--lib/gnutls_privkey.c2
-rw-r--r--lib/gnutls_pubkey.c20
-rw-r--r--lib/gnutls_sig.c8
-rw-r--r--lib/includes/gnutls/gnutls.h.in5
-rw-r--r--lib/nettle/pk.c10
-rw-r--r--lib/pkcs11_int.h6
-rw-r--r--lib/pkcs11_privkey.c2
-rw-r--r--lib/pkcs11_write.c4
-rw-r--r--lib/x509/key_decode.c4
-rw-r--r--lib/x509/key_encode.c6
-rw-r--r--lib/x509/output.c2
-rw-r--r--lib/x509/privkey.c10
-rw-r--r--lib/x509/privkey_pkcs8.c4
-rw-r--r--lib/x509/verify.c2
-rw-r--r--src/certtool.c6
-rw-r--r--src/p11tool.gaa2
-rw-r--r--tests/slow/keygen.c2
22 files changed, 62 insertions, 61 deletions
diff --git a/lib/algorithms/publickey.c b/lib/algorithms/publickey.c
index 0b25655c89..e9f9b3ee61 100644
--- a/lib/algorithms/publickey.c
+++ b/lib/algorithms/publickey.c
@@ -51,7 +51,7 @@ static const gnutls_pk_map pk_mappings[] = {
{GNUTLS_KX_DHE_RSA, GNUTLS_PK_RSA, CIPHER_SIGN},
{GNUTLS_KX_SRP_RSA, GNUTLS_PK_RSA, CIPHER_SIGN},
{GNUTLS_KX_ECDHE_RSA, GNUTLS_PK_RSA, CIPHER_SIGN},
- {GNUTLS_KX_ECDHE_ECDSA, GNUTLS_PK_ECC, CIPHER_SIGN},
+ {GNUTLS_KX_ECDHE_ECDSA, GNUTLS_PK_EC, CIPHER_SIGN},
{GNUTLS_KX_DHE_DSS, GNUTLS_PK_DSA, CIPHER_SIGN},
{GNUTLS_KX_SRP_DSS, GNUTLS_PK_DSA, CIPHER_SIGN},
{0, 0, 0}
@@ -97,7 +97,7 @@ static const gnutls_pk_entry pk_algorithms[] = {
{"DSA", PK_DSA_OID, GNUTLS_PK_DSA},
{"GOST R 34.10-2001", PK_GOST_R3410_2001_OID, GNUTLS_PK_UNKNOWN},
{"GOST R 34.10-94", PK_GOST_R3410_94_OID, GNUTLS_PK_UNKNOWN},
- {"ECC", "1.2.840.10045.2.1", GNUTLS_PK_ECC},
+ {"EC", "1.2.840.10045.2.1", GNUTLS_PK_EC},
{0, 0, 0}
};
diff --git a/lib/algorithms/secparams.c b/lib/algorithms/secparams.c
index 456e3a1269..2584c252f4 100644
--- a/lib/algorithms/secparams.c
+++ b/lib/algorithms/secparams.c
@@ -82,7 +82,7 @@ gnutls_sec_param_to_pk_bits (gnutls_pk_algorithm_t algo,
);
return ret;
}
- else if (algo == GNUTLS_PK_ECC)
+ else if (algo == GNUTLS_PK_EC)
{
GNUTLS_SEC_PARAM_LOOP (if (p->sec_param == param)
{
@@ -166,7 +166,7 @@ gnutls_pk_bits_to_sec_param (gnutls_pk_algorithm_t algo, unsigned int bits)
if (bits == 0)
return GNUTLS_SEC_PARAM_UNKNOWN;
- if (algo == GNUTLS_PK_ECC)
+ if (algo == GNUTLS_PK_EC)
{
GNUTLS_SEC_PARAM_LOOP (if (p->ecc_bits > bits)
{
diff --git a/lib/algorithms/sign.c b/lib/algorithms/sign.c
index edbca4b674..ba98d6bcb5 100644
--- a/lib/algorithms/sign.c
+++ b/lib/algorithms/sign.c
@@ -66,11 +66,11 @@ static const gnutls_sign_entry sign_algorithms[] = {
GNUTLS_MAC_MD5, {1, 1}},
{"RSA-MD2", SIG_RSA_MD2_OID, GNUTLS_SIGN_RSA_MD2, GNUTLS_PK_RSA,
GNUTLS_MAC_MD2, TLS_SIGN_AID_UNKNOWN},
- {"ECDSA-SHA1", "1.2.840.10045.4.1", GNUTLS_SIGN_ECDSA_SHA1, GNUTLS_PK_ECC, GNUTLS_MAC_SHA1, {2, 3}},
- {"ECDSA-SHA224", "1.2.840.10045.4.3.1", GNUTLS_SIGN_ECDSA_SHA224, GNUTLS_PK_ECC, GNUTLS_MAC_SHA224, {3, 3}},
- {"ECDSA-SHA256", "1.2.840.10045.4.3.2", GNUTLS_SIGN_ECDSA_SHA256, GNUTLS_PK_ECC, GNUTLS_MAC_SHA256, {4, 3}},
- {"ECDSA-SHA384", "1.2.840.10045.4.3.3", GNUTLS_SIGN_ECDSA_SHA384, GNUTLS_PK_ECC, GNUTLS_MAC_SHA384, {5, 3}},
- {"ECDSA-SHA512", "1.2.840.10045.4.3.4", GNUTLS_SIGN_ECDSA_SHA512, GNUTLS_PK_ECC, GNUTLS_MAC_SHA512, {6, 3}},
+ {"ECDSA-SHA1", "1.2.840.10045.4.1", GNUTLS_SIGN_ECDSA_SHA1, GNUTLS_PK_EC, GNUTLS_MAC_SHA1, {2, 3}},
+ {"ECDSA-SHA224", "1.2.840.10045.4.3.1", GNUTLS_SIGN_ECDSA_SHA224, GNUTLS_PK_EC, GNUTLS_MAC_SHA224, {3, 3}},
+ {"ECDSA-SHA256", "1.2.840.10045.4.3.2", GNUTLS_SIGN_ECDSA_SHA256, GNUTLS_PK_EC, GNUTLS_MAC_SHA256, {4, 3}},
+ {"ECDSA-SHA384", "1.2.840.10045.4.3.3", GNUTLS_SIGN_ECDSA_SHA384, GNUTLS_PK_EC, GNUTLS_MAC_SHA384, {5, 3}},
+ {"ECDSA-SHA512", "1.2.840.10045.4.3.4", GNUTLS_SIGN_ECDSA_SHA512, GNUTLS_PK_EC, GNUTLS_MAC_SHA512, {6, 3}},
{"GOST R 34.10-2001", SIG_GOST_R3410_2001_OID, 0, 0, 0,
TLS_SIGN_AID_UNKNOWN},
{"GOST R 34.10-94", SIG_GOST_R3410_94_OID, 0, 0, 0, TLS_SIGN_AID_UNKNOWN},
diff --git a/lib/auth/cert.c b/lib/auth/cert.c
index c60bdf414a..cdd0d70b34 100644
--- a/lib/auth/cert.c
+++ b/lib/auth/cert.c
@@ -1458,7 +1458,7 @@ _gnutls_check_supported_sign_algo (CertificateSigType algo)
case DSA_SIGN:
return GNUTLS_PK_DSA;
case ECDSA_SIGN:
- return GNUTLS_PK_ECC;
+ return GNUTLS_PK_EC;
}
return -1;
diff --git a/lib/auth/ecdh_common.c b/lib/auth/ecdh_common.c
index 2ea3d9534a..9a85f3d8ac 100644
--- a/lib/auth/ecdh_common.c
+++ b/lib/auth/ecdh_common.c
@@ -61,12 +61,12 @@ int ret;
_gnutls_mpi_set_ui(pub.params[8], 1);
if (psk_key == NULL)
- ret = _gnutls_pk_derive(GNUTLS_PK_ECC, &session->key->key, &session->key->ecdh_params, &pub);
+ ret = _gnutls_pk_derive(GNUTLS_PK_EC, &session->key->key, &session->key->ecdh_params, &pub);
else
{
gnutls_datum_t tmp_dh_key;
- ret = _gnutls_pk_derive(GNUTLS_PK_ECC, &tmp_dh_key, &session->key->ecdh_params, &pub);
+ ret = _gnutls_pk_derive(GNUTLS_PK_EC, &tmp_dh_key, &session->key->ecdh_params, &pub);
if (ret < 0)
{
ret = gnutls_assert_val(ret);
@@ -145,7 +145,7 @@ _gnutls_gen_ecdh_common_client_kx_int (gnutls_session_t session,
int curve = _gnutls_session_ecc_curve_get(session);
/* generate temporal key */
- ret = _gnutls_pk_generate(GNUTLS_PK_ECC, curve, &session->key->ecdh_params);
+ ret = _gnutls_pk_generate(GNUTLS_PK_EC, curve, &session->key->ecdh_params);
if (ret < 0)
return gnutls_assert_val(ret);
@@ -231,7 +231,7 @@ int _gnutls_ecdh_common_print_server_kx (gnutls_session_t session, gnutls_buffer
return gnutls_assert_val(ret);
/* generate temporal key */
- ret = _gnutls_pk_generate(GNUTLS_PK_ECC, curve, &session->key->ecdh_params);
+ ret = _gnutls_pk_generate(GNUTLS_PK_EC, curve, &session->key->ecdh_params);
if (ret < 0)
return gnutls_assert_val(ret);
diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index 3b43eaf52a..453a210e38 100644
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -157,7 +157,7 @@ privkey_to_pubkey (gnutls_pk_algorithm_t pk,
}
break;
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
pub->params[0] = _gnutls_mpi_copy (priv->params[0]);
pub->params[1] = _gnutls_mpi_copy (priv->params[1]);
pub->params[2] = _gnutls_mpi_copy (priv->params[2]);
diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c
index f9d8d2f747..3e93306e37 100644
--- a/lib/gnutls_pubkey.c
+++ b/lib/gnutls_pubkey.c
@@ -71,7 +71,7 @@ int pubkey_to_bits(gnutls_pk_algorithm_t pk, gnutls_pk_params_st* params)
return _gnutls_mpi_get_nbits(params->params[0]);
case GNUTLS_PK_DSA:
return _gnutls_mpi_get_nbits(params->params[3]);
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
return gnutls_ecc_curve_get_size(params->flags)*8;
default:
return 0;
@@ -302,7 +302,7 @@ gnutls_pubkey_import_pkcs11 (gnutls_pubkey_t key,
&obj->pubkey[1],
&obj->pubkey[2], &obj->pubkey[3]);
break;
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
ret = gnutls_pubkey_import_ecc_x962 (key, &obj->pubkey[0],
&obj->pubkey[1]);
break;
@@ -731,7 +731,7 @@ gnutls_pubkey_get_pk_ecc_raw (gnutls_pubkey_t key, gnutls_ecc_curve_t *curve,
return GNUTLS_E_INVALID_REQUEST;
}
- if (key->pk_algorithm != GNUTLS_PK_ECC)
+ if (key->pk_algorithm != GNUTLS_PK_EC)
{
gnutls_assert ();
return GNUTLS_E_INVALID_REQUEST;
@@ -778,7 +778,7 @@ int gnutls_pubkey_get_pk_ecc_x962 (gnutls_pubkey_t key, gnutls_datum_t* paramete
{
int ret;
- if (key == NULL || key->pk_algorithm != GNUTLS_PK_ECC)
+ if (key == NULL || key->pk_algorithm != GNUTLS_PK_EC)
return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
ret = _gnutls_x509_write_ecc_pubkey(&key->params, ecpoint);
@@ -1152,7 +1152,7 @@ gnutls_pubkey_import_ecc_raw (gnutls_pubkey_t key,
goto cleanup;
}
key->params.params_nr++;
- key->pk_algorithm = GNUTLS_PK_ECC;
+ key->pk_algorithm = GNUTLS_PK_EC;
return 0;
@@ -1206,7 +1206,7 @@ gnutls_pubkey_import_ecc_x962 (gnutls_pubkey_t key,
goto cleanup;
}
key->params.params_nr+=2;
- key->pk_algorithm = GNUTLS_PK_ECC;
+ key->pk_algorithm = GNUTLS_PK_EC;
return 0;
@@ -1462,7 +1462,7 @@ int hash_algo;
}
}
- else if (pubkey->pk_algorithm == GNUTLS_PK_ECC)
+ else if (pubkey->pk_algorithm == GNUTLS_PK_EC)
{
if (_gnutls_version_has_selectable_sighash (ver) && sign != GNUTLS_SIGN_UNKNOWN)
{
@@ -1658,7 +1658,7 @@ pubkey_verify_hashed_data (gnutls_pk_algorithm_t pk,
return 1;
break;
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
case GNUTLS_PK_DSA:
if (dsa_verify_hashed_data(hash, signature, pk, issuer_params) != 0)
{
@@ -1700,7 +1700,7 @@ pubkey_verify_data (gnutls_pk_algorithm_t pk,
return 1;
break;
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
case GNUTLS_PK_DSA:
if (dsa_verify_data(pk, algo, data, signature, issuer_params) != 0)
{
@@ -1724,7 +1724,7 @@ _gnutls_dsa_q_to_hash (gnutls_pk_algorithm_t algo, const gnutls_pk_params_st* pa
if (algo == GNUTLS_PK_DSA)
bits = _gnutls_mpi_get_nbits (params->params[1]);
- else if (algo == GNUTLS_PK_ECC)
+ else if (algo == GNUTLS_PK_EC)
bits = gnutls_ecc_curve_get_size(params->flags)*8;
if (bits <= 160)
diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index cdd46feffa..16db728a79 100644
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -136,7 +136,7 @@ _gnutls_handshake_sign_data (gnutls_session_t session, gnutls_pcert_st* cert,
}
break;
case GNUTLS_PK_DSA:
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
_gnutls_hash_deinit (&td_sha, concat);
if (!IS_SHA(hash_algo))
@@ -314,7 +314,7 @@ verify_tls_hash (gnutls_protocol_t ver, gnutls_pcert_st* cert,
break;
case GNUTLS_PK_DSA:
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
vdata.data = &hash_concat->data[sha1pos];
vdata.size = hash_concat->size - sha1pos;
@@ -705,7 +705,7 @@ _gnutls_handshake_sign_cert_vrfy (gnutls_session_t session,
dconcat.size = 36;
break;
case GNUTLS_PK_DSA:
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
dconcat.data = &concat[16];
dconcat.size = 20;
@@ -779,7 +779,7 @@ pk_prepare_hash (gnutls_pk_algorithm_t pk,
_gnutls_free_datum (&old_digest);
break;
case GNUTLS_PK_DSA:
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
break;
default:
gnutls_assert ();
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 3080dd0172..424deaecc8 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -562,13 +562,14 @@ extern "C"
GNUTLS_CRT_PRINT_UNSIGNED_FULL = 2
} gnutls_certificate_print_formats_t;
+#define GNUTLS_PK_ECC GNUTLS_PK_EC
/**
* gnutls_pk_algorithm_t:
* @GNUTLS_PK_UNKNOWN: Unknown public-key algorithm.
* @GNUTLS_PK_RSA: RSA public-key algorithm.
* @GNUTLS_PK_DSA: DSA public-key algorithm.
* @GNUTLS_PK_DH: Diffie-Hellman algorithm. Used to generate parameters.
- * @GNUTLS_PK_ECC: Elliptic curve algorithm. Used to generate parameters.
+ * @GNUTLS_PK_EC: Elliptic curve algorithm. Used to generate parameters.
*
* Enumeration of different public-key algorithms.
*/
@@ -578,7 +579,7 @@ extern "C"
GNUTLS_PK_RSA = 1,
GNUTLS_PK_DSA = 2,
GNUTLS_PK_DH = 3,
- GNUTLS_PK_ECC = 4,
+ GNUTLS_PK_EC = 4,
} gnutls_pk_algorithm_t;
const char *gnutls_pk_algorithm_get_name (gnutls_pk_algorithm_t algorithm);
diff --git a/lib/nettle/pk.c b/lib/nettle/pk.c
index 7e73d51abf..622830796b 100644
--- a/lib/nettle/pk.c
+++ b/lib/nettle/pk.c
@@ -127,7 +127,7 @@ static int _wrap_nettle_pk_derive(gnutls_pk_algorithm_t algo, gnutls_datum_t * o
switch (algo)
{
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
{
ecc_key ecc_pub, ecc_priv;
int curve = priv->flags;
@@ -373,7 +373,7 @@ _wrap_nettle_pk_sign (gnutls_pk_algorithm_t algo,
switch (algo)
{
- case GNUTLS_PK_ECC: /* we do ECDSA */
+ case GNUTLS_PK_EC: /* we do ECDSA */
{
ecc_key priv;
struct dsa_signature sig;
@@ -555,7 +555,7 @@ _wrap_nettle_pk_verify (gnutls_pk_algorithm_t algo,
switch (algo)
{
- case GNUTLS_PK_ECC: /* ECDSA */
+ case GNUTLS_PK_EC: /* ECDSA */
{
ecc_key pub;
struct dsa_signature sig;
@@ -784,7 +784,7 @@ rsa_fail:
break;
}
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
{
ecc_key key;
ecc_set_type tls_ecc_set;
@@ -953,7 +953,7 @@ dsa_cleanup:
}
break;
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
{
int curve = params->flags;
ecc_key ecc_priv;
diff --git a/lib/pkcs11_int.h b/lib/pkcs11_int.h
index 2480da7769..7d2cbe40b3 100644
--- a/lib/pkcs11_int.h
+++ b/lib/pkcs11_int.h
@@ -100,7 +100,7 @@ static inline int pk_to_mech(gnutls_pk_algorithm_t pk)
{
if (pk == GNUTLS_PK_DSA)
return CKM_DSA;
- else if (pk == GNUTLS_PK_ECC)
+ else if (pk == GNUTLS_PK_EC)
return CKM_ECDSA;
else
return CKM_RSA_PKCS;
@@ -113,7 +113,7 @@ static inline gnutls_pk_algorithm_t mech_to_pk(ck_key_type_t m)
else if (m == CKK_DSA)
return GNUTLS_PK_DSA;
else if (m == CKK_ECDSA)
- return GNUTLS_PK_ECC;
+ return GNUTLS_PK_EC;
else return GNUTLS_PK_UNKNOWN;
}
@@ -121,7 +121,7 @@ static inline int pk_to_genmech(gnutls_pk_algorithm_t pk)
{
if (pk == GNUTLS_PK_DSA)
return CKM_DSA_KEY_PAIR_GEN;
- else if (pk == GNUTLS_PK_ECC)
+ else if (pk == GNUTLS_PK_EC)
return CKM_ECDSA_KEY_PAIR_GEN;
else
return CKM_RSA_PKCS_KEY_PAIR_GEN;
diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c
index 8210874266..a44e87bab4 100644
--- a/lib/pkcs11_privkey.c
+++ b/lib/pkcs11_privkey.c
@@ -500,7 +500,7 @@ gnutls_pkcs11_privkey_generate (const char* url,
a[a_val].value_len = sizeof (_bits);
a_val++;
break;
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
p[p_val].type = CKA_SIGN;
p[p_val].value = (void*)&tval;
p[p_val].value_len = sizeof (tval);
diff --git a/lib/pkcs11_write.c b/lib/pkcs11_write.c
index 005b92d419..b61c356d13 100644
--- a/lib/pkcs11_write.c
+++ b/lib/pkcs11_write.c
@@ -438,7 +438,7 @@ gnutls_pkcs11_copy_x509_privkey (const char *token_url,
break;
}
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
{
ret = _gnutls_x509_write_ecc_params(&key->params, &p);
if (ret < 0)
@@ -509,7 +509,7 @@ cleanup:
gnutls_free (x.data);
break;
}
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
{
gnutls_free (p.data);
gnutls_free (x.data);
diff --git a/lib/x509/key_decode.c b/lib/x509/key_decode.c
index 8383a941c3..da44020f01 100644
--- a/lib/x509/key_decode.c
+++ b/lib/x509/key_decode.c
@@ -253,7 +253,7 @@ int ret;
ret = _gnutls_x509_read_dsa_pubkey(der, dersize, params);
if (ret >= 0) params->params_nr = DSA_PUBLIC_PARAMS;
break;
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
ret = _gnutls_x509_read_ecc_pubkey(der, dersize, params);
if (ret >= 0) params->params_nr = ECC_PUBLIC_PARAMS;
break;
@@ -273,7 +273,7 @@ int _gnutls_x509_read_pubkey_params (gnutls_pk_algorithm_t algo, opaque * der, i
return 0;
case GNUTLS_PK_DSA:
return _gnutls_x509_read_dsa_params(der, dersize, params);
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
return _gnutls_x509_read_ecc_params(der, dersize, params);
default:
return gnutls_assert_val(GNUTLS_E_UNIMPLEMENTED_FEATURE);
diff --git a/lib/x509/key_encode.c b/lib/x509/key_encode.c
index 926148a1bf..2b6c838d4a 100644
--- a/lib/x509/key_encode.c
+++ b/lib/x509/key_encode.c
@@ -142,7 +142,7 @@ _gnutls_x509_write_pubkey_params (gnutls_pk_algorithm_t algo,
memcpy(der->data, ASN1_NULL, ASN1_NULL_SIZE);
der->size = ASN1_NULL_SIZE;
return 0;
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
return _gnutls_x509_write_ecc_params(params, der);
default:
return gnutls_assert_val(GNUTLS_E_UNIMPLEMENTED_FEATURE);
@@ -160,7 +160,7 @@ _gnutls_x509_write_pubkey (gnutls_pk_algorithm_t algo,
return _gnutls_x509_write_dsa_pubkey(params, der);
case GNUTLS_PK_RSA:
return _gnutls_x509_write_rsa_pubkey(params, der);
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
return _gnutls_x509_write_ecc_pubkey(params, der);
default:
return gnutls_assert_val(GNUTLS_E_UNIMPLEMENTED_FEATURE);
@@ -780,7 +780,7 @@ int _gnutls_asn1_encode_privkey (gnutls_pk_algorithm_t pk, ASN1_TYPE * c2, gnutl
return _gnutls_asn1_encode_rsa(c2, params);
case GNUTLS_PK_DSA:
return _gnutls_asn1_encode_dsa(c2, params);
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
return _gnutls_asn1_encode_ecc(c2, params);
default:
return GNUTLS_E_UNIMPLEMENTED_FEATURE;
diff --git a/lib/x509/output.c b/lib/x509/output.c
index aa3f763fde..d21a420ff2 100644
--- a/lib/x509/output.c
+++ b/lib/x509/output.c
@@ -1217,7 +1217,7 @@ print_cert (gnutls_buffer_st * str, gnutls_x509_crt_t cert, int notsigned)
}
break;
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
{
gnutls_datum_t x, y;
gnutls_ecc_curve_t curve;
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index f0d4738800..d320aa8b8b 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -476,7 +476,7 @@ gnutls_x509_privkey_import (gnutls_x509_privkey_t key,
_gnutls_fbase64_decode (PEM_KEY_ECC, data->data, data->size,
&out);
if (result >= 0)
- key->pk_algorithm = GNUTLS_PK_ECC;
+ key->pk_algorithm = GNUTLS_PK_EC;
}
}
@@ -504,7 +504,7 @@ gnutls_x509_privkey_import (gnutls_x509_privkey_t key,
if (key->key == NULL)
gnutls_assert ();
}
- else if (key->pk_algorithm == GNUTLS_PK_ECC)
+ else if (key->pk_algorithm == GNUTLS_PK_EC)
{
key->key = _gnutls_privkey_decode_ecc_key (&_data, key);
if (key->key == NULL)
@@ -883,7 +883,7 @@ gnutls_x509_privkey_import_ecc_raw (gnutls_x509_privkey_t key,
}
key->params.params_nr++;
- key->pk_algorithm = GNUTLS_PK_ECC;
+ key->pk_algorithm = GNUTLS_PK_EC;
return 0;
@@ -955,7 +955,7 @@ gnutls_x509_privkey_export (gnutls_x509_privkey_t key,
msg = PEM_KEY_RSA;
else if (key->pk_algorithm == GNUTLS_PK_DSA)
msg = PEM_KEY_DSA;
- else if (key->pk_algorithm == GNUTLS_PK_ECC)
+ else if (key->pk_algorithm == GNUTLS_PK_EC)
msg = PEM_KEY_ECC;
else
msg = "UNKNOWN";
@@ -1335,7 +1335,7 @@ gnutls_x509_privkey_generate (gnutls_x509_privkey_t key,
gnutls_pk_params_init(&key->params);
- if (algo == GNUTLS_PK_ECC)
+ if (algo == GNUTLS_PK_EC)
bits = _gnutls_ecc_bits_to_curve(bits);
ret = _gnutls_pk_generate (algo, bits, &key->params);
diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index 4421c73971..065e552d29 100644
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -140,7 +140,7 @@ _encode_privkey (gnutls_x509_privkey_t pkey, gnutls_datum_t * raw)
switch (pkey->pk_algorithm)
{
case GNUTLS_PK_RSA:
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
ret =
gnutls_x509_privkey_export (pkey, GNUTLS_X509_FMT_DER, NULL, &size);
if (ret != GNUTLS_E_SHORT_MEMORY_BUFFER)
@@ -1132,7 +1132,7 @@ decode_private_key_info (const gnutls_datum_t * der,
result = _decode_pkcs8_rsa_key (pkcs8_asn, pkey);
else if (pkey->pk_algorithm == GNUTLS_PK_DSA)
result = _decode_pkcs8_dsa_key (pkcs8_asn, pkey);
- else if (pkey->pk_algorithm == GNUTLS_PK_ECC)
+ else if (pkey->pk_algorithm == GNUTLS_PK_EC)
result = _decode_pkcs8_ecc_key (pkcs8_asn, pkey);
else return gnutls_assert_val(GNUTLS_E_UNIMPLEMENTED_FEATURE);
diff --git a/lib/x509/verify.c b/lib/x509/verify.c
index ff67ea9b5f..90d3c28ff6 100644
--- a/lib/x509/verify.c
+++ b/lib/x509/verify.c
@@ -691,7 +691,7 @@ _gnutls_x509_verify_algorithm (gnutls_mac_algorithm_t * hash,
switch (pk)
{
case GNUTLS_PK_DSA:
- case GNUTLS_PK_ECC:
+ case GNUTLS_PK_EC:
if (hash)
*hash = _gnutls_dsa_q_to_hash (pk, issuer_params, NULL);
diff --git a/src/certtool.c b/src/certtool.c
index 972e50d384..11de1f995e 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -196,7 +196,7 @@ generate_private_key_int (void)
if (info.dsa)
key_type = GNUTLS_PK_DSA;
else if (info.ecc)
- key_type = GNUTLS_PK_ECC;
+ key_type = GNUTLS_PK_EC;
else
key_type = GNUTLS_PK_RSA;
@@ -1709,7 +1709,7 @@ const char *cprint;
gnutls_free (g.data);
}
}
- else if (key_type == GNUTLS_PK_ECC)
+ else if (key_type == GNUTLS_PK_EC)
{
gnutls_datum_t y, x, k;
gnutls_ecc_curve_t curve;
@@ -2987,7 +2987,7 @@ pubkey_info (gnutls_x509_crt_t crt, common_info_st * cinfo)
gnutls_free (g.data);
}
}
- else if (ret == GNUTLS_PK_ECC)
+ else if (ret == GNUTLS_PK_EC)
{
gnutls_datum_t x, y;
gnutls_ecc_curve_t curve;
diff --git a/src/p11tool.gaa b/src/p11tool.gaa
index 3c3cdfc411..d138db0913 100644
--- a/src/p11tool.gaa
+++ b/src/p11tool.gaa
@@ -40,7 +40,7 @@ option (delete) STR "URL" { $action = ACTION_PKCS11_DELETE_URL; $pkcs11_url = $1
#int key_type;
option (generate-rsa) STR "URL" { $action = ACTION_PKCS11_GENERATE; $key_type = GNUTLS_PK_RSA; $pkcs11_url = $1; } "Generates an RSA private key on the specified token."
option (generate-dsa) STR "URL" { $action = ACTION_PKCS11_GENERATE; $key_type = GNUTLS_PK_DSA; $pkcs11_url = $1; } "Generates a DSA private key on the specified token."
-option (generate-ecc) STR "URL" { $action = ACTION_PKCS11_GENERATE; $key_type = GNUTLS_PK_ECC; $pkcs11_url = $1; } "Generates an ECDSA private key on the specified token."
+option (generate-ecc) STR "URL" { $action = ACTION_PKCS11_GENERATE; $key_type = GNUTLS_PK_EC; $pkcs11_url = $1; } "Generates an ECDSA private key on the specified token."
option (label) STR "label" { $pkcs11_label = $1; } "Sets a label for the write operation."
#int pkcs11_trusted;
diff --git a/tests/slow/keygen.c b/tests/slow/keygen.c
index 3b95479779..c398abcd09 100644
--- a/tests/slow/keygen.c
+++ b/tests/slow/keygen.c
@@ -59,7 +59,7 @@ doit (void)
for (i = 0; i < MAX_TRIES; i++)
{
- for (algorithm = GNUTLS_PK_RSA; algorithm <= GNUTLS_PK_ECC;
+ for (algorithm = GNUTLS_PK_RSA; algorithm <= GNUTLS_PK_EC;
algorithm++)
{
if (algorithm == GNUTLS_PK_DH)
View Lorry Controller Status