Ticket #44323: patch-c89.diff

File patch-c89.diff, 6.1 KB (added by ryandesign (Ryan Schmidt), 2 years ago)
  • lib/includes/gnutls/abstract.h

    Fix "error: comma at end of enumerator list" when compiling with C89
    old new  
    5151typedef enum gnutls_pubkey_flags {
    5252        GNUTLS_PUBKEY_VERIFY_FLAG_TLS1_RSA = 1,
    5353        GNUTLS_PUBKEY_DISABLE_CALLBACKS = 1 << 2,
    54         GNUTLS_PUBKEY_GET_OPENPGP_FINGERPRINT = 1 << 3,
     54        GNUTLS_PUBKEY_GET_OPENPGP_FINGERPRINT = 1 << 3
    5555} gnutls_pubkey_flags_t;
    5656
    5757typedef int (*gnutls_privkey_sign_func) (gnutls_privkey_t key,
     
    271271        GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE = 1,
    272272        GNUTLS_PRIVKEY_IMPORT_COPY = 1 << 1,
    273273        GNUTLS_PRIVKEY_DISABLE_CALLBACKS = 1 << 2,
    274         GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA = 1 << 4,
     274        GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA = 1 << 4
    275275} gnutls_privkey_flags_t;
    276276
    277277int gnutls_privkey_import_pkcs11(gnutls_privkey_t pkey,
  • lib/includes/gnutls/gnutls.h.in

    old new  
    169169        GNUTLS_KX_ECDHE_RSA = 12,
    170170        GNUTLS_KX_ECDHE_ECDSA = 13,
    171171        GNUTLS_KX_ECDHE_PSK = 14,
    172         GNUTLS_KX_RSA_PSK = 15,
     172        GNUTLS_KX_RSA_PSK = 15
    173173} gnutls_kx_algorithm_t;
    174174
    175175/**
     
    183183typedef enum {
    184184        GNUTLS_PARAMS_RSA_EXPORT = 1,
    185185        GNUTLS_PARAMS_DH = 2,
    186         GNUTLS_PARAMS_ECDH = 3,
     186        GNUTLS_PARAMS_ECDH = 3
    187187} gnutls_params_type_t;
    188188
    189189/**
     
    241241           gnutls_digest_algorithm_t. */
    242242        GNUTLS_MAC_AEAD = 200,  /* indicates that MAC is on the cipher */
    243243        GNUTLS_MAC_UMAC_96 = 201,
    244         GNUTLS_MAC_UMAC_128 = 202,
     244        GNUTLS_MAC_UMAC_128 = 202
    245245} gnutls_mac_algorithm_t;
    246246
    247247/**
     
    292292        GNUTLS_COMP_UNKNOWN = 0,
    293293        GNUTLS_COMP_NULL = 1,
    294294        GNUTLS_COMP_DEFLATE = 2,
    295         GNUTLS_COMP_ZLIB = GNUTLS_COMP_DEFLATE,
     295        GNUTLS_COMP_ZLIB = GNUTLS_COMP_DEFLATE
    296296} gnutls_compression_method_t;
    297297
    298298  /*
     
    391391        GNUTLS_A_CERTIFICATE_UNOBTAINABLE = 111,
    392392        GNUTLS_A_UNRECOGNIZED_NAME = 112,
    393393        GNUTLS_A_UNKNOWN_PSK_IDENTITY = 115,
    394         GNUTLS_A_NO_APPLICATION_PROTOCOL = 120,
     394        GNUTLS_A_NO_APPLICATION_PROTOCOL = 120
    395395} gnutls_alert_description_t;
    396396
    397397/**
     
    431431        GNUTLS_HANDSHAKE_CERTIFICATE_STATUS = 22,
    432432        GNUTLS_HANDSHAKE_SUPPLEMENTAL = 23,
    433433        GNUTLS_HANDSHAKE_CHANGE_CIPHER_SPEC = 254,
    434         GNUTLS_HANDSHAKE_CLIENT_HELLO_V2 = 1024,
     434        GNUTLS_HANDSHAKE_CLIENT_HELLO_V2 = 1024
    435435} gnutls_handshake_description_t;
    436436
    437437#define GNUTLS_HANDSHAKE_ANY ((unsigned int)-1)
     
    482482        GNUTLS_CERT_UNEXPECTED_OWNER = 1 << 14,
    483483        GNUTLS_CERT_REVOCATION_DATA_ISSUED_IN_FUTURE = 1 << 15,
    484484        GNUTLS_CERT_SIGNER_CONSTRAINTS_FAILURE = 1 << 16,
    485         GNUTLS_CERT_MISMATCH = 1 << 17,
     485        GNUTLS_CERT_MISMATCH = 1 << 17
    486486} gnutls_certificate_status_t;
    487487
    488488/**
     
    596596        GNUTLS_CRT_PRINT_ONELINE = 1,
    597597        GNUTLS_CRT_PRINT_UNSIGNED_FULL = 2,
    598598        GNUTLS_CRT_PRINT_COMPACT = 3,
    599         GNUTLS_CRT_PRINT_FULL_NUMBERS = 4,
     599        GNUTLS_CRT_PRINT_FULL_NUMBERS = 4
    600600} gnutls_certificate_print_formats_t;
    601601
    602602#define GNUTLS_PK_ECC GNUTLS_PK_EC
     
    615615        GNUTLS_PK_RSA = 1,
    616616        GNUTLS_PK_DSA = 2,
    617617        GNUTLS_PK_DH = 3,
    618         GNUTLS_PK_EC = 4,
     618        GNUTLS_PK_EC = 4
    619619} gnutls_pk_algorithm_t;
    620620
    621621const char *gnutls_pk_algorithm_get_name(gnutls_pk_algorithm_t algorithm);
     
    665665        GNUTLS_SIGN_ECDSA_SHA384 = 15,
    666666        GNUTLS_SIGN_ECDSA_SHA512 = 16,
    667667        GNUTLS_SIGN_DSA_SHA384 = 17,
    668         GNUTLS_SIGN_DSA_SHA512 = 18,
     668        GNUTLS_SIGN_DSA_SHA512 = 18
    669669} gnutls_sign_algorithm_t;
    670670
    671671/**
     
    685685        GNUTLS_ECC_CURVE_SECP256R1,
    686686        GNUTLS_ECC_CURVE_SECP384R1,
    687687        GNUTLS_ECC_CURVE_SECP521R1,
    688         GNUTLS_ECC_CURVE_SECP192R1,
     688        GNUTLS_ECC_CURVE_SECP192R1
    689689} gnutls_ecc_curve_t;
    690690
    691691/* macros to allow specifying a specific curve in gnutls_privkey_generate()
     
    719719        GNUTLS_SEC_PARAM_LEGACY = 2,
    720720        GNUTLS_SEC_PARAM_MEDIUM = 3,
    721721        GNUTLS_SEC_PARAM_HIGH = 4,
    722         GNUTLS_SEC_PARAM_ULTRA = 5,
     722        GNUTLS_SEC_PARAM_ULTRA = 5
    723723} gnutls_sec_param_t;
    724724
    725725/* old name */
     
    15951595   * Enumeration of different random art types.
    15961596   */
    15971597typedef enum gnutls_random_art {
    1598         GNUTLS_RANDOM_ART_OPENSSH = 1,
     1598        GNUTLS_RANDOM_ART_OPENSSH = 1
    15991599} gnutls_random_art_t;
    16001600
    16011601int gnutls_random_art(gnutls_random_art_t type,
     
    19341934typedef enum {
    19351935        GNUTLS_DT_UNKNOWN = 0,
    19361936        GNUTLS_DT_DNS_HOSTNAME = 1,
    1937         GNUTLS_DT_KEY_PURPOSE_OID = 2,
     1937        GNUTLS_DT_KEY_PURPOSE_OID = 2
    19381938} gnutls_vdata_types_t;
    19391939
    19401940typedef struct {
     
    20822082        GNUTLS_PIN_FINAL_TRY = (1 << 2),
    20832083        GNUTLS_PIN_COUNT_LOW = (1 << 3),
    20842084        GNUTLS_PIN_CONTEXT_SPECIFIC = (1 << 4),
    2085         GNUTLS_PIN_WRONG = (1 << 5),
     2085        GNUTLS_PIN_WRONG = (1 << 5)
    20862086} gnutls_pin_flag_t;
    20872087
    20882088#define GNUTLS_PKCS11_PIN_USER GNUTLS_PIN_USER
  • lib/includes/gnutls/ocsp.h

    old new  
    4646 */
    4747typedef enum gnutls_ocsp_print_formats_t {
    4848        GNUTLS_OCSP_PRINT_FULL = 0,
    49         GNUTLS_OCSP_PRINT_COMPACT = 1,
     49        GNUTLS_OCSP_PRINT_COMPACT = 1
    5050} gnutls_ocsp_print_formats_t;
    5151
    5252/**
  • lib/includes/gnutls/pkcs11.h

    old new  
    217217        GNUTLS_PKCS11_OBJ_ATTR_PUBKEY,  /* public keys */
    218218        GNUTLS_PKCS11_OBJ_ATTR_PRIVKEY, /* private keys */
    219219        GNUTLS_PKCS11_OBJ_ATTR_ALL,     /* everything! */
    220         GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED_CA,  /* CAs */
     220        GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED_CA   /* CAs */
    221221} gnutls_pkcs11_obj_attr_t;
    222222
    223223/**
     
    234234        GNUTLS_PKCS11_TOKEN_LABEL,
    235235        GNUTLS_PKCS11_TOKEN_SERIAL,
    236236        GNUTLS_PKCS11_TOKEN_MANUFACTURER,
    237         GNUTLS_PKCS11_TOKEN_MODEL,
     237        GNUTLS_PKCS11_TOKEN_MODEL
    238238} gnutls_pkcs11_token_info_t;
    239239
    240240/**
  • lib/includes/gnutls/x509.h

    old new  
    821821        GNUTLS_VERIFY_DISABLE_CRL_CHECKS = 1 << 9,
    822822        GNUTLS_VERIFY_ALLOW_UNSORTED_CHAIN = 1 << 10,
    823823        GNUTLS_VERIFY_DO_NOT_ALLOW_UNSORTED_CHAIN = 1 << 11,
    824         GNUTLS_VERIFY_DO_NOT_ALLOW_WILDCARDS = 1 << 12,
     824        GNUTLS_VERIFY_DO_NOT_ALLOW_WILDCARDS = 1 << 12
    825825} gnutls_certificate_verify_flags;
    826826
    827827/**
     
    854854        GNUTLS_PROFILE_ULTRA = 7,
    855855       
    856856        GNUTLS_PROFILE_SUITEB128=32,
    857         GNUTLS_PROFILE_SUITEB192=33,
     857        GNUTLS_PROFILE_SUITEB192=33
    858858        /*GNUTLS_PROFILE_MAX=255*/
    859859} gnutls_certificate_verification_profiles_t;
    860860