diff options
Diffstat (limited to 'lib/includes/gnutls/gnutls.h.in')
| -rw-r--r-- | lib/includes/gnutls/gnutls.h.in | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in index 91df048b3c..351090f6a8 100644 --- a/lib/includes/gnutls/gnutls.h.in +++ b/lib/includes/gnutls/gnutls.h.in @@ -657,13 +657,15 @@ typedef enum gnutls_certificate_print_formats { } gnutls_certificate_print_formats_t; #define GNUTLS_PK_ECC GNUTLS_PK_EC +#define GNUTLS_PK_EC GNUTLS_PK_ECDSA /** * 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_EC: Elliptic curve algorithm. Used to generate parameters. + * @GNUTLS_PK_ECDSA: Elliptic curve DSA algorithm. + * @GNUTLS_PK_EDDSA: Edwards curve Digital signature algorithm. * * Enumeration of different public-key algorithms. */ @@ -672,7 +674,8 @@ typedef enum { GNUTLS_PK_RSA = 1, GNUTLS_PK_DSA = 2, GNUTLS_PK_DH = 3, - GNUTLS_PK_EC = 4 + GNUTLS_PK_ECDSA = 4, + GNUTLS_PK_EDDSA = 5 } gnutls_pk_algorithm_t; const char *gnutls_pk_algorithm_get_name(gnutls_pk_algorithm_t algorithm); @@ -700,6 +703,7 @@ const char *gnutls_pk_algorithm_get_name(gnutls_pk_algorithm_t algorithm); * @GNUTLS_SIGN_ECDSA_SHA384: Digital signature algorithm ECDSA with SHA-384. * @GNUTLS_SIGN_ECDSA_SHA512: Digital signature algorithm ECDSA with SHA-512. * @GNUTLS_SIGN_ECDSA_SHA224: Digital signature algorithm ECDSA with SHA-224. + * @GNUTLS_SIGN_EDDSA_SHA512: Digital signature algorithm EdDSA with SHA-512. * * Enumeration of different digital signature algorithms. */ @@ -724,7 +728,8 @@ typedef enum { GNUTLS_SIGN_ECDSA_SHA384 = 15, GNUTLS_SIGN_ECDSA_SHA512 = 16, GNUTLS_SIGN_DSA_SHA384 = 17, - GNUTLS_SIGN_DSA_SHA512 = 18 + GNUTLS_SIGN_DSA_SHA512 = 18, + GNUTLS_SIGN_EDDSA_SHA512 = 19 } gnutls_sign_algorithm_t; /** @@ -735,6 +740,7 @@ typedef enum { * @GNUTLS_ECC_CURVE_SECP256R1: the SECP256R1 curve * @GNUTLS_ECC_CURVE_SECP384R1: the SECP384R1 curve * @GNUTLS_ECC_CURVE_SECP521R1: the SECP521R1 curve + * @GNUTLS_ECC_CURVE_ED25519PH: the Ed25519 curve (in prehash mode) * * Enumeration of ECC curves. */ @@ -744,7 +750,8 @@ typedef enum { GNUTLS_ECC_CURVE_SECP256R1, GNUTLS_ECC_CURVE_SECP384R1, GNUTLS_ECC_CURVE_SECP521R1, - GNUTLS_ECC_CURVE_SECP192R1 + GNUTLS_ECC_CURVE_SECP192R1, + GNUTLS_ECC_CURVE_ED25519PH } gnutls_ecc_curve_t; /* macros to allow specifying a specific curve in gnutls_privkey_generate() @@ -866,6 +873,7 @@ unsigned int gnutls_sec_param_to_symmetric_bits(gnutls_sec_param_t param) __GNUTLS_CONST__; /* Elliptic curves */ +gnutls_pk_algorithm_t gnutls_ecc_curve_get_pk(gnutls_ecc_curve_t curve); const char * gnutls_ecc_curve_get_name(gnutls_ecc_curve_t curve) __GNUTLS_CONST__; const char * |