diff options
author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-06-09 18:17:34 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-06-12 10:19:29 +0200 |
commit | ba6f25691d5f66f92e99261ca804dd7094f5fc64 (patch) | |
tree | 963898a7cdb0721774ee1d129b217fc7cd4eb339 | |
parent | 99625724b0de1d13f9b42c35155f378e18698c3f (diff) | |
download | gnutls-ba6f25691d5f66f92e99261ca804dd7094f5fc64.tar.gz |
corrected typo in x962 functions
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r-- | lib/auth/ecdhe.c | 8 | ||||
-rw-r--r-- | lib/ecc.c | 4 | ||||
-rw-r--r-- | lib/ecc.h | 4 | ||||
-rw-r--r-- | lib/pubkey.c | 2 | ||||
-rw-r--r-- | lib/x509/key_decode.c | 2 | ||||
-rw-r--r-- | lib/x509/key_encode.c | 4 | ||||
-rw-r--r-- | lib/x509/privkey.c | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/lib/auth/ecdhe.c b/lib/auth/ecdhe.c index 24cdf11430..c79e43347e 100644 --- a/lib/auth/ecdhe.c +++ b/lib/auth/ecdhe.c @@ -155,7 +155,7 @@ int _gnutls_proc_ecdh_common_client_kx(gnutls_session_t session, if (ecurve->pk == GNUTLS_PK_EC) { ret = - _gnutls_ecc_ansi_x963_import(&data[i], point_size, + _gnutls_ecc_ansi_x962_import(&data[i], point_size, &session->key.ecdh_x, &session->key.ecdh_y); if (ret < 0) { @@ -247,7 +247,7 @@ _gnutls_gen_ecdh_common_client_kx_int(gnutls_session_t session, if (pk == GNUTLS_PK_EC) { ret = - _gnutls_ecc_ansi_x963_export(curve, + _gnutls_ecc_ansi_x962_export(curve, session->key.ecdh_params. params[ECC_X] /* x */ , session->key.ecdh_params. @@ -360,7 +360,7 @@ _gnutls_proc_ecdh_common_server_kx(gnutls_session_t session, if (ecurve->pk == GNUTLS_PK_EC) { ret = - _gnutls_ecc_ansi_x963_import(&data[i], point_size, + _gnutls_ecc_ansi_x962_import(&data[i], point_size, &session->key.ecdh_x, &session->key.ecdh_y); if (ret < 0) @@ -431,7 +431,7 @@ int _gnutls_ecdh_common_print_server_kx(gnutls_session_t session, if (pk == GNUTLS_PK_EC) { ret = - _gnutls_ecc_ansi_x963_export(curve, + _gnutls_ecc_ansi_x962_export(curve, session->key.ecdh_params. params[ECC_X] /* x */ , session->key.ecdh_params. @@ -30,7 +30,7 @@ #include "errors.h" int -_gnutls_ecc_ansi_x963_export(gnutls_ecc_curve_t curve, bigint_t x, +_gnutls_ecc_ansi_x962_export(gnutls_ecc_curve_t curve, bigint_t x, bigint_t y, gnutls_datum_t * out) { int numlen = gnutls_ecc_curve_get_size(curve); @@ -93,7 +93,7 @@ _gnutls_ecc_ansi_x963_export(gnutls_ecc_curve_t curve, bigint_t x, int -_gnutls_ecc_ansi_x963_import(const uint8_t * in, +_gnutls_ecc_ansi_x962_import(const uint8_t * in, unsigned long inlen, bigint_t * x, bigint_t * y) { @@ -23,9 +23,9 @@ #ifndef GNUTLS_ECC_H #define GNUTLS_ECC_H -int _gnutls_ecc_ansi_x963_import(const uint8_t * in, unsigned long inlen, +int _gnutls_ecc_ansi_x962_import(const uint8_t * in, unsigned long inlen, bigint_t * x, bigint_t * y); -int _gnutls_ecc_ansi_x963_export(gnutls_ecc_curve_t curve, bigint_t x, +int _gnutls_ecc_ansi_x962_export(gnutls_ecc_curve_t curve, bigint_t x, bigint_t y, gnutls_datum_t * out); #endif diff --git a/lib/pubkey.c b/lib/pubkey.c index 2f5ab5dc3a..5df44e2c6d 100644 --- a/lib/pubkey.c +++ b/lib/pubkey.c @@ -1586,7 +1586,7 @@ gnutls_pubkey_import_ecc_x962(gnutls_pubkey_t key, goto cleanup; } - ret = _gnutls_ecc_ansi_x963_import(raw_point.data, raw_point.size, + ret = _gnutls_ecc_ansi_x962_import(raw_point.data, raw_point.size, &key->params.params[ECC_X], &key->params.params[ECC_Y]); if (ret < 0) { diff --git a/lib/x509/key_decode.c b/lib/x509/key_decode.c index 8d929f7315..5db6d9ebf0 100644 --- a/lib/x509/key_decode.c +++ b/lib/x509/key_decode.c @@ -104,7 +104,7 @@ _gnutls_x509_read_ecc_pubkey(uint8_t * der, int dersize, /* RFC5480 defines the public key to be an ECPoint (i.e. OCTET STRING), * Then it says that the OCTET STRING _value_ is converted to BIT STRING. * That means that the value we place there is the raw X9.62 one. */ - return _gnutls_ecc_ansi_x963_import(der, dersize, + return _gnutls_ecc_ansi_x962_import(der, dersize, ¶ms->params[ECC_X], ¶ms->params[ECC_Y]); } diff --git a/lib/x509/key_encode.c b/lib/x509/key_encode.c index 724f7402d9..af5e5be5a7 100644 --- a/lib/x509/key_encode.c +++ b/lib/x509/key_encode.c @@ -118,7 +118,7 @@ _gnutls_x509_write_ecc_pubkey(gnutls_pk_params_st * params, return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST); result = - _gnutls_ecc_ansi_x963_export(params->flags, + _gnutls_ecc_ansi_x962_export(params->flags, params->params[ECC_X], params->params[ECC_Y], /*&out */ der); @@ -620,7 +620,7 @@ _gnutls_asn1_encode_ecc(ASN1_TYPE * c2, gnutls_pk_params_st * params) return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST); ret = - _gnutls_ecc_ansi_x963_export(params->flags, + _gnutls_ecc_ansi_x962_export(params->flags, params->params[ECC_X], params->params[ECC_Y], &pubkey); if (ret < 0) diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c index 4aeab9df62..b82d6d5236 100644 --- a/lib/x509/privkey.c +++ b/lib/x509/privkey.c @@ -334,7 +334,7 @@ _gnutls_privkey_decode_ecc_key(ASN1_TYPE* pkey_asn, const gnutls_datum_t * raw_k } ret = - _gnutls_ecc_ansi_x963_import(out.data, out.size, + _gnutls_ecc_ansi_x962_import(out.data, out.size, &pkey->params.params[ECC_X], &pkey->params.params[ECC_Y]); |