mirrors/libmicrohttpd
2
0 Fork 0
mirror of https://git.gnunet.org/libmicrohttpd.git synced 2026-10-07 04:02:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

'microhttps.h' merge

Browse Source 
gnutls version added to configure.ac to enable assersion before running curl tests
GNUTLS symbol renaming
This commit is contained in:
lv-426 committed 2008-07-26 03:26:56 +00:00
1 parent 14a5721937
commit 16abaea132
69 files changed
+1790 -1811
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/daemon/https/openpgp/gnutls_extra.c
-5
View File
@@ -55,11 +55,6 @@ gnutls_global_init_extra (void)
* libextra, then do not initialize the library.
* This is because it may break things.
*/
if (strcmp (gnutls_check_version (NULL), VERSION) != 0)
{
return GNUTLS_E_LIBRARY_VERSION_MISMATCH;
}
_gnutls_init_extra++;
if (_gnutls_init_extra != 1)
src/daemon/https/openpgp/gnutls_ia.c
+2 -2
View File
@@ -461,7 +461,7 @@ _gnutls_ia_client_handshake (gnutls_session_t session)
ssize_t len;
int ret;
const struct gnutls_ia_client_credentials_st *cred =
_gnutls_get_cred (session->key, GNUTLS_CRD_IA, NULL);
_gnutls_get_cred (session->key, MHD_GNUTLS_CRD_IA, NULL);
if (cred == NULL)
return GNUTLS_E_INTERNAL_ERROR;
@@ -529,7 +529,7 @@ _gnutls_ia_server_handshake (gnutls_session_t session)
char buf[1024];
int ret;
const struct gnutls_ia_server_credentials_st *cred =
_gnutls_get_cred (session->key, GNUTLS_CRD_IA, NULL);
_gnutls_get_cred (session->key, MHD_GNUTLS_CRD_IA, NULL);
if (cred == NULL)
return GNUTLS_E_INTERNAL_ERROR;
src/daemon/https/openpgp/gnutls_openpgp.c
+4 -4
View File
@@ -112,10 +112,10 @@ openpgp_pk_to_gnutls_cert (gnutls_cert * cert, cdk_pkt_pubkey_t pk)
return GNUTLS_E_UNWANTED_ALGORITHM;
}
algo = GNUTLS_PK_RSA;
algo = MHD_GNUTLS_PK_RSA;
cert->subject_pk_algorithm = algo;
cert->version = pk->version;
cert->cert_type = GNUTLS_CRT_OPENPGP;
cert->cert_type = MHD_GNUTLS_CRT_OPENPGP;
cert->key_usage = 0;
if (pk->pubkey_usage & CDK_KEY_USG_SIGN)
@@ -247,7 +247,7 @@ _gnutls_openpgp_raw_privkey_to_gkey (gnutls_privkey * pkey,
if (is_ELG (pke_algo))
return GNUTLS_E_UNWANTED_ALGORITHM;
else if (is_RSA (pke_algo))
pkey->pk_algorithm = GNUTLS_PK_RSA;
pkey->pk_algorithm = MHD_GNUTLS_PK_RSA;
leave:
cdk_kbnode_release (snode);
@@ -885,7 +885,7 @@ _gnutls_openpgp_crt_to_gcert (gnutls_cert * gcert, gnutls_openpgp_crt_t cert)
int ret;
memset (gcert, 0, sizeof (gnutls_cert));
gcert->cert_type = GNUTLS_CRT_OPENPGP;
gcert->cert_type = MHD_GNUTLS_CRT_OPENPGP;
ret = gnutls_openpgp_crt_export (cert, GNUTLS_OPENPGP_FMT_RAW,
src/daemon/https/openpgp/pgp.c
+2 -2
View File
@@ -337,7 +337,7 @@ gnutls_openpgp_crt_get_pk_algorithm (gnutls_openpgp_crt_t key,
int algo;
if (!key)
return GNUTLS_PK_UNKNOWN;
return MHD_GNUTLS_PK_UNKNOWN;
algo = 0;
pkt = cdk_kbnode_find_packet (key->knode, CDK_PKT_PUBLIC_KEY);
@@ -347,7 +347,7 @@ gnutls_openpgp_crt_get_pk_algorithm (gnutls_openpgp_crt_t key,
*bits = cdk_pk_get_nbits (pkt->pkt.public_key);
algo = pkt->pkt.public_key->pubkey_algo;
if (is_RSA (algo))
algo = GNUTLS_PK_RSA;
algo = MHD_GNUTLS_PK_RSA;
else
algo = GNUTLS_E_UNKNOWN_PK_ALGORITHM;
}
src/daemon/https/openpgp/pgp_privkey.c
+1 -1
View File
@@ -126,7 +126,7 @@ gnutls_openpgp_privkey_get_pk_algorithm (gnutls_openpgp_privkey_t key,
if (bits)
{
*bits = 0;
if (pk == GNUTLS_PK_RSA)
if (pk == MHD_GNUTLS_PK_RSA)
*bits = _gnutls_mpi_get_nbits (key->pkey.params[0]);
}