Ticket #44323: patch-lib-includes-gnutls-gnutls.h.in.diff
File patch-lib-includes-gnutls-gnutls.h.in.diff, 3.7 KB (added by ryandesign (Ryan Carsten Schmidt), 10 years ago) |
---|
-
lib/includes/gnutls/gnutls.h.in
old new 169 169 GNUTLS_KX_ECDHE_RSA = 12, 170 170 GNUTLS_KX_ECDHE_ECDSA = 13, 171 171 GNUTLS_KX_ECDHE_PSK = 14, 172 GNUTLS_KX_RSA_PSK = 15 ,172 GNUTLS_KX_RSA_PSK = 15 173 173 } gnutls_kx_algorithm_t; 174 174 175 175 /** … … 183 183 typedef enum { 184 184 GNUTLS_PARAMS_RSA_EXPORT = 1, 185 185 GNUTLS_PARAMS_DH = 2, 186 GNUTLS_PARAMS_ECDH = 3 ,186 GNUTLS_PARAMS_ECDH = 3 187 187 } gnutls_params_type_t; 188 188 189 189 /** … … 241 241 gnutls_digest_algorithm_t. */ 242 242 GNUTLS_MAC_AEAD = 200, /* indicates that MAC is on the cipher */ 243 243 GNUTLS_MAC_UMAC_96 = 201, 244 GNUTLS_MAC_UMAC_128 = 202 ,244 GNUTLS_MAC_UMAC_128 = 202 245 245 } gnutls_mac_algorithm_t; 246 246 247 247 /** … … 292 292 GNUTLS_COMP_UNKNOWN = 0, 293 293 GNUTLS_COMP_NULL = 1, 294 294 GNUTLS_COMP_DEFLATE = 2, 295 GNUTLS_COMP_ZLIB = GNUTLS_COMP_DEFLATE ,295 GNUTLS_COMP_ZLIB = GNUTLS_COMP_DEFLATE 296 296 } gnutls_compression_method_t; 297 297 298 298 /* … … 391 391 GNUTLS_A_CERTIFICATE_UNOBTAINABLE = 111, 392 392 GNUTLS_A_UNRECOGNIZED_NAME = 112, 393 393 GNUTLS_A_UNKNOWN_PSK_IDENTITY = 115, 394 GNUTLS_A_NO_APPLICATION_PROTOCOL = 120 ,394 GNUTLS_A_NO_APPLICATION_PROTOCOL = 120 395 395 } gnutls_alert_description_t; 396 396 397 397 /** … … 431 431 GNUTLS_HANDSHAKE_CERTIFICATE_STATUS = 22, 432 432 GNUTLS_HANDSHAKE_SUPPLEMENTAL = 23, 433 433 GNUTLS_HANDSHAKE_CHANGE_CIPHER_SPEC = 254, 434 GNUTLS_HANDSHAKE_CLIENT_HELLO_V2 = 1024 ,434 GNUTLS_HANDSHAKE_CLIENT_HELLO_V2 = 1024 435 435 } gnutls_handshake_description_t; 436 436 437 437 #define GNUTLS_HANDSHAKE_ANY ((unsigned int)-1) … … 482 482 GNUTLS_CERT_UNEXPECTED_OWNER = 1 << 14, 483 483 GNUTLS_CERT_REVOCATION_DATA_ISSUED_IN_FUTURE = 1 << 15, 484 484 GNUTLS_CERT_SIGNER_CONSTRAINTS_FAILURE = 1 << 16, 485 GNUTLS_CERT_MISMATCH = 1 << 17 ,485 GNUTLS_CERT_MISMATCH = 1 << 17 486 486 } gnutls_certificate_status_t; 487 487 488 488 /** … … 596 596 GNUTLS_CRT_PRINT_ONELINE = 1, 597 597 GNUTLS_CRT_PRINT_UNSIGNED_FULL = 2, 598 598 GNUTLS_CRT_PRINT_COMPACT = 3, 599 GNUTLS_CRT_PRINT_FULL_NUMBERS = 4 ,599 GNUTLS_CRT_PRINT_FULL_NUMBERS = 4 600 600 } gnutls_certificate_print_formats_t; 601 601 602 602 #define GNUTLS_PK_ECC GNUTLS_PK_EC … … 615 615 GNUTLS_PK_RSA = 1, 616 616 GNUTLS_PK_DSA = 2, 617 617 GNUTLS_PK_DH = 3, 618 GNUTLS_PK_EC = 4 ,618 GNUTLS_PK_EC = 4 619 619 } gnutls_pk_algorithm_t; 620 620 621 621 const char *gnutls_pk_algorithm_get_name(gnutls_pk_algorithm_t algorithm); … … 665 665 GNUTLS_SIGN_ECDSA_SHA384 = 15, 666 666 GNUTLS_SIGN_ECDSA_SHA512 = 16, 667 667 GNUTLS_SIGN_DSA_SHA384 = 17, 668 GNUTLS_SIGN_DSA_SHA512 = 18 ,668 GNUTLS_SIGN_DSA_SHA512 = 18 669 669 } gnutls_sign_algorithm_t; 670 670 671 671 /** … … 685 685 GNUTLS_ECC_CURVE_SECP256R1, 686 686 GNUTLS_ECC_CURVE_SECP384R1, 687 687 GNUTLS_ECC_CURVE_SECP521R1, 688 GNUTLS_ECC_CURVE_SECP192R1 ,688 GNUTLS_ECC_CURVE_SECP192R1 689 689 } gnutls_ecc_curve_t; 690 690 691 691 /* macros to allow specifying a specific curve in gnutls_privkey_generate() … … 719 719 GNUTLS_SEC_PARAM_LEGACY = 2, 720 720 GNUTLS_SEC_PARAM_MEDIUM = 3, 721 721 GNUTLS_SEC_PARAM_HIGH = 4, 722 GNUTLS_SEC_PARAM_ULTRA = 5 ,722 GNUTLS_SEC_PARAM_ULTRA = 5 723 723 } gnutls_sec_param_t; 724 724 725 725 /* old name */ … … 1595 1595 * Enumeration of different random art types. 1596 1596 */ 1597 1597 typedef enum gnutls_random_art { 1598 GNUTLS_RANDOM_ART_OPENSSH = 1 ,1598 GNUTLS_RANDOM_ART_OPENSSH = 1 1599 1599 } gnutls_random_art_t; 1600 1600 1601 1601 int gnutls_random_art(gnutls_random_art_t type, … … 1934 1934 typedef enum { 1935 1935 GNUTLS_DT_UNKNOWN = 0, 1936 1936 GNUTLS_DT_DNS_HOSTNAME = 1, 1937 GNUTLS_DT_KEY_PURPOSE_OID = 2 ,1937 GNUTLS_DT_KEY_PURPOSE_OID = 2 1938 1938 } gnutls_vdata_types_t; 1939 1939 1940 1940 typedef struct { … … 2082 2082 GNUTLS_PIN_FINAL_TRY = (1 << 2), 2083 2083 GNUTLS_PIN_COUNT_LOW = (1 << 3), 2084 2084 GNUTLS_PIN_CONTEXT_SPECIFIC = (1 << 4), 2085 GNUTLS_PIN_WRONG = (1 << 5) ,2085 GNUTLS_PIN_WRONG = (1 << 5) 2086 2086 } gnutls_pin_flag_t; 2087 2087 2088 2088 #define GNUTLS_PKCS11_PIN_USER GNUTLS_PIN_USER