'microhttps.h' merge

gnutls version added to configure.ac to enable assersion before running curl tests
GNUTLS symbol renaming

12 files changed, 57 insertions, 55 deletions

diff --git a/src/daemon/https/x509/common.c b/src/daemon/https/x509/common.c
index 98a655c7..82d433ce 100644
--- a/src/daemon/https/x509/common.c
+++ b/src/daemon/https/x509/common.c
@@ -1244,7 +1244,7 @@ _gnutls_x509_encode_and_copy_PKI_params (ASN1_TYPE dst,
       return _gnutls_asn2err (result);
     }
 
-  if (pk_algorithm == GNUTLS_PK_RSA)
+  if (pk_algorithm == MHD_GNUTLS_PK_RSA)
     {
       /* disable parameters, which are not used in RSA.
        */
@@ -1363,7 +1363,7 @@ _gnutls_x509_get_pk_algorithm (ASN1_TYPE src,
 
   switch (algo)
     {
-    case GNUTLS_PK_RSA:
+    case MHD_GNUTLS_PK_RSA:
       {
         if ((result = _gnutls_x509_read_rsa_params (str, len, params)) < 0)
           {
diff --git a/src/daemon/https/x509/crl_write.c b/src/daemon/https/x509/crl_write.c
index 370a492c..465f1782 100644
--- a/src/daemon/https/x509/crl_write.c
+++ b/src/daemon/https/x509/crl_write.c
@@ -143,7 +143,8 @@ int
 gnutls_x509_crl_sign (gnutls_x509_crl_t crl, gnutls_x509_crt_t issuer,
                       gnutls_x509_privkey_t issuer_key)
 {
-  return gnutls_x509_crl_sign2 (crl, issuer, issuer_key, GNUTLS_DIG_SHA1, 0);
+  return gnutls_x509_crl_sign2 (crl, issuer, issuer_key, MHD_GNUTLS_DIG_SHA1,
+                                0);
 }
 
 /**
diff --git a/src/daemon/https/x509/crq.c b/src/daemon/https/x509/crq.c
index 8e663d51..8a60d35f 100644
--- a/src/daemon/https/x509/crq.c
+++ b/src/daemon/https/x509/crq.c
@@ -805,7 +805,7 @@ gnutls_x509_crq_sign2 (gnutls_x509_crq_t crq, gnutls_x509_privkey_t key,
 int
 gnutls_x509_crq_sign (gnutls_x509_crq_t crq, gnutls_x509_privkey_t key)
 {
-  return gnutls_x509_crq_sign2 (crq, key, GNUTLS_DIG_SHA1, 0);
+  return gnutls_x509_crq_sign2 (crq, key, MHD_GNUTLS_DIG_SHA1, 0);
 }
 
 /**
diff --git a/src/daemon/https/x509/mpi.c b/src/daemon/https/x509/mpi.c
index 7fbd0b75..0d39adb5 100644
--- a/src/daemon/https/x509/mpi.c
+++ b/src/daemon/https/x509/mpi.c
@@ -231,7 +231,7 @@ _gnutls_x509_crt_get_mpis (gnutls_x509_crt_t cert,
 
   switch (pk_algorithm)
     {
-    case GNUTLS_PK_RSA:
+    case MHD_GNUTLS_PK_RSA:
       /* params[0] is the modulus,
        * params[1] is the exponent
        */
@@ -365,7 +365,7 @@ _gnutls_x509_write_sig_params (ASN1_TYPE dst,
   _gnutls_str_cpy (name, sizeof (name), dst_name);
   _gnutls_str_cat (name, sizeof (name), ".parameters");
 
-  if (pk_algorithm == GNUTLS_PK_RSA)
+  if (pk_algorithm == MHD_GNUTLS_PK_RSA)
     {                           /* RSA */
       result = asn1_write_value (dst, name, NULL, 0);
 
diff --git a/src/daemon/https/x509/output.c b/src/daemon/https/x509/output.c
index dcc87ab1..8892cf4e 100644
--- a/src/daemon/https/x509/output.c
+++ b/src/daemon/https/x509/output.c
@@ -612,7 +612,7 @@ print_cert (gnutls_string * str, gnutls_x509_crt_t cert, int notsigned)
         addf (str, _("\tSubject Public Key Algorithm: %s\n"), name);
         switch (err)
           {
-          case GNUTLS_PK_RSA:
+          case MHD_GNUTLS_PK_RSA:
             {
               gnutls_datum_t m, e;
 
@@ -932,7 +932,7 @@ print_fingerprint (gnutls_string * str, gnutls_x509_crt_t cert,
       return;
     }
 
-  if (algo == GNUTLS_DIG_MD5)
+  if (algo == MHD_GNUTLS_DIG_MD5)
     addf (str, _("\tMD5 fingerprint:\n\t\t"));
   else
     addf (str, _("\tSHA-1 fingerprint:\n\t\t"));
@@ -981,8 +981,8 @@ print_other (gnutls_string * str, gnutls_x509_crt_t cert, int notsigned)
 {
   if (!notsigned)
     {
-      print_fingerprint (str, cert, GNUTLS_DIG_MD5);
-      print_fingerprint (str, cert, GNUTLS_DIG_SHA1);
+      print_fingerprint (str, cert, MHD_GNUTLS_DIG_MD5);
+      print_fingerprint (str, cert, MHD_GNUTLS_DIG_SHA1);
     }
   print_keyid (str, cert);
 }
@@ -1088,7 +1088,7 @@ print_oneline (gnutls_string * str, gnutls_x509_crt_t cert)
     size_t size = sizeof (buffer);
     int err;
 
-    err = gnutls_x509_crt_get_fingerprint (cert, GNUTLS_DIG_SHA1,
+    err = gnutls_x509_crt_get_fingerprint (cert, MHD_GNUTLS_DIG_SHA1,
                                            buffer, &size);
     if (err < 0)
       {
diff --git a/src/daemon/https/x509/pkcs12.c b/src/daemon/https/x509/pkcs12.c
index 40f7a243..abd647b0 100644
--- a/src/daemon/https/x509/pkcs12.c
+++ b/src/daemon/https/x509/pkcs12.c
@@ -924,7 +924,7 @@ gnutls_pkcs12_generate_mac (gnutls_pkcs12_t pkcs12, const char *pass)
 
   /* MAC the data
    */
-  td1 = _gnutls_hmac_init (GNUTLS_MAC_SHA1, key, sizeof (key));
+  td1 = _gnutls_hmac_init (MHD_GNUTLS_MAC_SHA1, key, sizeof (key));
   if (td1 == GNUTLS_MAC_FAILED)
     {
       gnutls_assert ();
@@ -1050,7 +1050,7 @@ gnutls_pkcs12_verify_mac (gnutls_pkcs12_t pkcs12, const char *pass)
 
   /* MAC the data
    */
-  td1 = _gnutls_hmac_init (GNUTLS_MAC_SHA1, key, sizeof (key));
+  td1 = _gnutls_hmac_init (MHD_GNUTLS_MAC_SHA1, key, sizeof (key));
   if (td1 == GNUTLS_MAC_FAILED)
     {
       gnutls_assert ();
diff --git a/src/daemon/https/x509/privkey_pkcs8.c b/src/daemon/https/x509/privkey_pkcs8.c
index 0812fa3c..c0ce6a5c 100644
--- a/src/daemon/https/x509/privkey_pkcs8.c
+++ b/src/daemon/https/x509/privkey_pkcs8.c
@@ -139,7 +139,7 @@ _encode_privkey (gnutls_x509_privkey pkey, gnutls_datum * raw)
 
   switch (pkey->pk_algorithm)
     {
-    case GNUTLS_PK_RSA:
+    case MHD_GNUTLS_PK_RSA:
       ret =
         gnutls_x509_privkey_export (pkey, GNUTLS_X509_FMT_DER, NULL, &size);
       if (ret != GNUTLS_E_SHORT_MEMORY_BUFFER)
@@ -196,7 +196,7 @@ encode_to_private_key_info (gnutls_x509_privkey_t pkey,
   gnutls_datum algo_params = { NULL, 0 };
   gnutls_datum algo_privkey = { NULL, 0 };
 
-  if (pkey->pk_algorithm == GNUTLS_PK_RSA)
+  if (pkey->pk_algorithm == MHD_GNUTLS_PK_RSA)
     {
       oid = PK_PKIX1_RSA_OID;
       /* parameters are null
@@ -612,17 +612,17 @@ read_pkcs_schema_params (schema_id schema, const char *password,
 
       if ((schema) == PKCS12_3DES_SHA1)
         {
-          enc_params->cipher = GNUTLS_CIPHER_3DES_CBC;
+          enc_params->cipher = MHD_GNUTLS_CIPHER_3DES_CBC;
           enc_params->iv_size = 8;
         }
       else if ((schema) == PKCS12_ARCFOUR_SHA1)
         {
-          enc_params->cipher = GNUTLS_CIPHER_ARCFOUR_128;
+          enc_params->cipher = MHD_GNUTLS_CIPHER_ARCFOUR_128;
           enc_params->iv_size = 0;
         }
       else if ((schema) == PKCS12_RC2_40_SHA1)
         {
-          enc_params->cipher = GNUTLS_CIPHER_RC2_40_CBC;
+          enc_params->cipher = MHD_GNUTLS_CIPHER_RC2_40_CBC;
           enc_params->iv_size = 8;
         }
 
@@ -950,7 +950,7 @@ decode_private_key_info (const gnutls_datum_t * der,
   /* we only support RSA and DSA private keys.
    */
   if (strcmp (oid, PK_PKIX1_RSA_OID) == 0)
-    pkey->pk_algorithm = GNUTLS_PK_RSA;
+    pkey->pk_algorithm = MHD_GNUTLS_PK_RSA;
   else
     {
       gnutls_assert ();
@@ -963,7 +963,7 @@ decode_private_key_info (const gnutls_datum_t * der,
   /* Get the DER encoding of the actual private key.
    */
 
-  if (pkey->pk_algorithm == GNUTLS_PK_RSA)
+  if (pkey->pk_algorithm == MHD_GNUTLS_PK_RSA)
     result = _decode_pkcs8_rsa_key (pkcs8_asn, pkey);
   if (result < 0)
     {
@@ -1021,7 +1021,7 @@ gnutls_x509_privkey_import_pkcs8 (gnutls_x509_privkey_t key,
   _data.data = data->data;
   _data.size = data->size;
 
-  key->pk_algorithm = GNUTLS_PK_UNKNOWN;
+  key->pk_algorithm = MHD_GNUTLS_PK_UNKNOWN;
 
   /* If the Certificate is in PEM format then decode it
    */
@@ -1082,7 +1082,7 @@ gnutls_x509_privkey_import_pkcs8 (gnutls_x509_privkey_t key,
   return 0;
 
 cleanup:
-  key->pk_algorithm = GNUTLS_PK_UNKNOWN;
+  key->pk_algorithm = MHD_GNUTLS_PK_UNKNOWN;
   if (need_free)
     _gnutls_free_datum (&_data);
   return result;
@@ -1291,13 +1291,13 @@ oid2cipher (const char *oid, gnutls_cipher_algorithm_t * algo)
 
   if (strcmp (oid, DES_EDE3_CBC_OID) == 0)
     {
-      *algo = GNUTLS_CIPHER_3DES_CBC;
+      *algo = MHD_GNUTLS_CIPHER_3DES_CBC;
       return 0;
     }
 
   if (strcmp (oid, DES_CBC_OID) == 0)
     {
-      *algo = GNUTLS_CIPHER_DES_CBC;
+      *algo = MHD_GNUTLS_CIPHER_DES_CBC;
       return 0;
     }
 
@@ -1697,11 +1697,11 @@ generate_key (schema_id schema,
    */
 
   if (schema == PKCS12_ARCFOUR_SHA1)
-    enc_params->cipher = GNUTLS_CIPHER_ARCFOUR_128;
+    enc_params->cipher = MHD_GNUTLS_CIPHER_ARCFOUR_128;
   else if (schema == PKCS12_3DES_SHA1)
-    enc_params->cipher = GNUTLS_CIPHER_3DES_CBC;
+    enc_params->cipher = MHD_GNUTLS_CIPHER_3DES_CBC;
   else if (schema == PKCS12_RC2_40_SHA1)
-    enc_params->cipher = GNUTLS_CIPHER_RC2_40_CBC;
+    enc_params->cipher = MHD_GNUTLS_CIPHER_RC2_40_CBC;
 
   if (gc_pseudo_random (rnd, 2) != GC_OK)
     {
diff --git a/src/daemon/https/x509/sign.c b/src/daemon/https/x509/sign.c
index 275fc3f7..7b21825e 100644
--- a/src/daemon/https/x509/sign.c
+++ b/src/daemon/https/x509/sign.c
@@ -162,7 +162,7 @@ pkcs1_rsa_sign (gnutls_digest_algorithm_t hash, const gnutls_datum_t * text,
     }
 
   if ((ret =
-       _gnutls_sign (GNUTLS_PK_RSA, params, params_len, &info,
+       _gnutls_sign (MHD_GNUTLS_PK_RSA, params, params_len, &info,
                      signature)) < 0)
     {
       gnutls_assert ();
@@ -193,7 +193,7 @@ _gnutls_x509_sign (const gnutls_datum_t * tbs,
 
   switch (signer->pk_algorithm)
     {
-    case GNUTLS_PK_RSA:
+    case MHD_GNUTLS_PK_RSA:
       ret =
         pkcs1_rsa_sign (hash, tbs, signer->params, signer->params_size,
                         signature);
diff --git a/src/daemon/https/x509/x509.c b/src/daemon/https/x509/x509.c
index 96999d27..90696168 100644
--- a/src/daemon/https/x509/x509.c
+++ b/src/daemon/https/x509/x509.c
@@ -2041,7 +2041,7 @@ rsadsa_get_key_id (gnutls_x509_crt_t crt,
       return result;
     }
 
-  if (pk == GNUTLS_PK_RSA)
+  if (pk == MHD_GNUTLS_PK_RSA)
     {
       result = _gnutls_x509_write_rsa_params (params, params_size, &der);
       if (result < 0)
@@ -2053,7 +2053,7 @@ rsadsa_get_key_id (gnutls_x509_crt_t crt,
   else
     return GNUTLS_E_INTERNAL_ERROR;
 
-  hd = _gnutls_hash_init (GNUTLS_MAC_SHA1);
+  hd = _gnutls_hash_init (MHD_GNUTLS_MAC_SHA1);
   if (hd == GNUTLS_HASH_FAILED)
     {
       gnutls_assert ();
@@ -2130,7 +2130,7 @@ gnutls_x509_crt_get_key_id (gnutls_x509_crt_t crt,
       return pk;
     }
 
-  if (pk == GNUTLS_PK_RSA)
+  if (pk == MHD_GNUTLS_PK_RSA)
     {
       /* This is for compatibility with what GnuTLS has printed for
          RSA/DSA before the code below was added.  The code below is
@@ -2165,7 +2165,7 @@ gnutls_x509_crt_get_key_id (gnutls_x509_crt_t crt,
       return _gnutls_asn2err (result);
     }
 
-  result = gnutls_fingerprint (GNUTLS_DIG_SHA1, &pubkey, output_data,
+  result = gnutls_fingerprint (MHD_GNUTLS_DIG_SHA1, &pubkey, output_data,
                                output_data_size);
 
   gnutls_afree (pubkey.data);
@@ -2581,7 +2581,7 @@ gnutls_x509_crt_get_pk_rsa_raw (gnutls_x509_crt_t crt,
     }
 
   ret = gnutls_x509_crt_get_pk_algorithm (crt, NULL);
-  if (ret != GNUTLS_PK_RSA)
+  if (ret != MHD_GNUTLS_PK_RSA)
     {
       gnutls_assert ();
       return GNUTLS_E_INVALID_REQUEST;
diff --git a/src/daemon/https/x509/x509_privkey.c b/src/daemon/https/x509/x509_privkey.c
index ff295fcd..596aedc0 100644
--- a/src/daemon/https/x509/x509_privkey.c
+++ b/src/daemon/https/x509/x509_privkey.c
@@ -64,7 +64,7 @@ gnutls_x509_privkey_init (gnutls_x509_privkey_t * key)
   if (*key)
     {
       (*key)->key = ASN1_TYPE_EMPTY;
-      (*key)->pk_algorithm = GNUTLS_PK_UNKNOWN;
+      (*key)->pk_algorithm = MHD_GNUTLS_PK_UNKNOWN;
       return 0;                 /* success */
     }
 
@@ -126,7 +126,7 @@ gnutls_x509_privkey_cpy (gnutls_x509_privkey_t dst, gnutls_x509_privkey_t src)
     {
       switch (dst->pk_algorithm)
         {
-        case GNUTLS_PK_RSA:
+        case MHD_GNUTLS_PK_RSA:
           ret = _gnutls_asn1_encode_rsa (&dst->key, dst->params);
           if (ret < 0)
             {
@@ -355,7 +355,7 @@ gnutls_x509_privkey_import (gnutls_x509_privkey_t key,
   _data.data = data->data;
   _data.size = data->size;
 
-  key->pk_algorithm = GNUTLS_PK_UNKNOWN;
+  key->pk_algorithm = MHD_GNUTLS_PK_UNKNOWN;
 
   /* If the Certificate is in PEM format then decode it */
   if (format == GNUTLS_X509_FMT_PEM)
@@ -365,7 +365,7 @@ gnutls_x509_privkey_import (gnutls_x509_privkey_t key,
       /* Try the first header */
       result
         = _gnutls_fbase64_decode (PEM_KEY_RSA, data->data, data->size, &out);
-      key->pk_algorithm = GNUTLS_PK_RSA;
+      key->pk_algorithm = MHD_GNUTLS_PK_RSA;
 
       // TODO rm
 //      if (result == GNUTLS_E_BASE64_UNEXPECTED_HEADER_ERROR)
@@ -390,7 +390,7 @@ gnutls_x509_privkey_import (gnutls_x509_privkey_t key,
       need_free = 1;
     }
 
-  if (key->pk_algorithm == GNUTLS_PK_RSA)
+  if (key->pk_algorithm == MHD_GNUTLS_PK_RSA)
     {
       key->key = _gnutls_privkey_decode_pkcs1_rsa_key (&_data, key);
       if (key->key == NULL)
@@ -399,7 +399,7 @@ gnutls_x509_privkey_import (gnutls_x509_privkey_t key,
   else
     {
       /* Try decoding with both, and accept the one that succeeds. */
-      key->pk_algorithm = GNUTLS_PK_RSA;
+      key->pk_algorithm = MHD_GNUTLS_PK_RSA;
       key->key = _gnutls_privkey_decode_pkcs1_rsa_key (&_data, key);
 
       // TODO rm
@@ -416,7 +416,7 @@ gnutls_x509_privkey_import (gnutls_x509_privkey_t key,
     {
       gnutls_assert ();
       result = GNUTLS_E_ASN1_DER_ERROR;
-      key->pk_algorithm = GNUTLS_PK_UNKNOWN;
+      key->pk_algorithm = MHD_GNUTLS_PK_UNKNOWN;
       return result;
     }
 
@@ -539,7 +539,7 @@ gnutls_x509_privkey_import_rsa_raw (gnutls_x509_privkey_t key,
     }
 
   key->params_size = RSA_PRIVATE_PARAMS;
-  key->pk_algorithm = GNUTLS_PK_RSA;
+  key->pk_algorithm = MHD_GNUTLS_PK_RSA;
 
   return 0;
 
@@ -605,7 +605,7 @@ gnutls_x509_privkey_export (gnutls_x509_privkey_t key,
       return GNUTLS_E_INVALID_REQUEST;
     }
 
-  if (key->pk_algorithm == GNUTLS_PK_RSA)
+  if (key->pk_algorithm == MHD_GNUTLS_PK_RSA)
     msg = PEM_KEY_RSA;
   else
     msg = NULL;
@@ -615,7 +615,7 @@ gnutls_x509_privkey_export (gnutls_x509_privkey_t key,
                                  */
       switch (key->pk_algorithm)
         {
-        case GNUTLS_PK_RSA:
+        case MHD_GNUTLS_PK_RSA:
           ret = _gnutls_asn1_encode_rsa (&key->key, key->params);
           if (ret < 0)
             {
@@ -1204,7 +1204,7 @@ gnutls_x509_privkey_generate (gnutls_x509_privkey_t key,
 
   switch (algo)
     {
-    case GNUTLS_PK_RSA:
+    case MHD_GNUTLS_PK_RSA:
       ret = _gnutls_rsa_generate_params (key->params, &params_len, bits);
       if (ret < 0)
         {
@@ -1223,7 +1223,7 @@ gnutls_x509_privkey_generate (gnutls_x509_privkey_t key,
         }
 
       key->params_size = params_len;
-      key->pk_algorithm = GNUTLS_PK_RSA;
+      key->pk_algorithm = MHD_GNUTLS_PK_RSA;
 
       break;
     default:
@@ -1233,7 +1233,7 @@ gnutls_x509_privkey_generate (gnutls_x509_privkey_t key,
 
   return 0;
 
-cleanup:key->pk_algorithm = GNUTLS_PK_UNKNOWN;
+cleanup:key->pk_algorithm = MHD_GNUTLS_PK_UNKNOWN;
   key->params_size = 0;
   for (i = 0; i < params_len; i++)
     _gnutls_mpi_release (&key->params[i]);
@@ -1287,7 +1287,7 @@ gnutls_x509_privkey_get_key_id (gnutls_x509_privkey_t key,
       return GNUTLS_E_SHORT_MEMORY_BUFFER;
     }
 
-  if (key->pk_algorithm == GNUTLS_PK_RSA)
+  if (key->pk_algorithm == MHD_GNUTLS_PK_RSA)
     {
       result = _gnutls_x509_write_rsa_params (key->params, key->params_size,
                                               &der);
@@ -1300,7 +1300,7 @@ gnutls_x509_privkey_get_key_id (gnutls_x509_privkey_t key,
   else
     return GNUTLS_E_INTERNAL_ERROR;
 
-  hd = _gnutls_hash_init (GNUTLS_MAC_SHA1);
+  hd = _gnutls_hash_init (MHD_GNUTLS_MAC_SHA1);
   if (hd == GNUTLS_HASH_FAILED)
     {
       gnutls_assert ();
@@ -1483,7 +1483,7 @@ gnutls_x509_privkey_fix (gnutls_x509_privkey_t key)
     asn1_delete_structure (&key->key);
   switch (key->pk_algorithm)
     {
-    case GNUTLS_PK_RSA:
+    case MHD_GNUTLS_PK_RSA:
       ret = _gnutls_asn1_encode_rsa (&key->key, key->params);
       if (ret < 0)
         {
diff --git a/src/daemon/https/x509/x509_verify.c b/src/daemon/https/x509/x509_verify.c
index f01fed9d..75cdef04 100644
--- a/src/daemon/https/x509/x509_verify.c
+++ b/src/daemon/https/x509/x509_verify.c
@@ -500,7 +500,7 @@ decode_ber_digest_info (const gnutls_datum_t * info,
 
   *hash = _gnutls_x509_oid2mac_algorithm (str);
 
-  if (*hash == GNUTLS_MAC_UNKNOWN)
+  if (*hash == MHD_GNUTLS_MAC_UNKNOWN)
     {
 
       _gnutls_x509_log ("verify.c: HASH OID: %s\n", str);
@@ -547,7 +547,7 @@ _pkcs1_rsa_verify_sig (const gnutls_datum_t * text,
                        const gnutls_datum_t * signature,
                        mpi_t * params, int params_len)
 {
-  gnutls_mac_algorithm_t hash = GNUTLS_MAC_UNKNOWN;
+  gnutls_mac_algorithm_t hash = MHD_GNUTLS_MAC_UNKNOWN;
   int ret;
   opaque digest[MAX_HASH_SIZE], md[MAX_HASH_SIZE];
   int digest_size;
@@ -613,7 +613,7 @@ dsa_verify_sig (const gnutls_datum_t * text,
   gnutls_datum_t digest;
   GNUTLS_HASH_HANDLE hd;
 
-  hd = _gnutls_hash_init (GNUTLS_MAC_SHA1);
+  hd = _gnutls_hash_init (MHD_GNUTLS_MAC_SHA1);
   if (hd == NULL)
     {
       gnutls_assert ();
@@ -643,7 +643,7 @@ verify_sig (const gnutls_datum_t * tbs,
 
   switch (pk)
     {
-    case GNUTLS_PK_RSA:
+    case MHD_GNUTLS_PK_RSA:
 
       if (_pkcs1_rsa_verify_sig
           (tbs, signature, issuer_params, issuer_params_size) != 0)
diff --git a/src/daemon/https/x509/x509_write.c b/src/daemon/https/x509/x509_write.c
index d9529c33..8855eadb 100644
--- a/src/daemon/https/x509/x509_write.c
+++ b/src/daemon/https/x509/x509_write.c
@@ -632,7 +632,8 @@ int
 gnutls_x509_crt_sign (gnutls_x509_crt_t crt, gnutls_x509_crt_t issuer,
                       gnutls_x509_privkey_t issuer_key)
 {
-  return gnutls_x509_crt_sign2 (crt, issuer, issuer_key, GNUTLS_DIG_SHA1, 0);
+  return gnutls_x509_crt_sign2 (crt, issuer, issuer_key, MHD_GNUTLS_DIG_SHA1,
+                                0);
 }
 
 /**