[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7772 - in libmicrohttpd/src/daemon/https: tls x509
From: |
gnunet |
Subject: |
[GNUnet-SVN] r7772 - in libmicrohttpd/src/daemon/https: tls x509 |
Date: |
Sun, 12 Oct 2008 21:56:53 -0600 (MDT) |
Author: grothoff
Date: 2008-10-12 21:56:53 -0600 (Sun, 12 Oct 2008)
New Revision: 7772
Modified:
libmicrohttpd/src/daemon/https/tls/auth_rsa.c
libmicrohttpd/src/daemon/https/tls/auth_rsa_export.c
libmicrohttpd/src/daemon/https/tls/gnutls_cert.c
libmicrohttpd/src/daemon/https/tls/gnutls_cert.h
libmicrohttpd/src/daemon/https/tls/gnutls_constate.c
libmicrohttpd/src/daemon/https/tls/gnutls_handshake.c
libmicrohttpd/src/daemon/https/tls/gnutls_mpi.h
libmicrohttpd/src/daemon/https/tls/gnutls_sig.c
libmicrohttpd/src/daemon/https/tls/gnutls_x509.c
libmicrohttpd/src/daemon/https/x509/common.c
libmicrohttpd/src/daemon/https/x509/x509.h
Log:
integrating fixes in gnutls
Modified: libmicrohttpd/src/daemon/https/tls/auth_rsa.c
===================================================================
--- libmicrohttpd/src/daemon/https/tls/auth_rsa.c 2008-10-13 02:03:44 UTC
(rev 7771)
+++ libmicrohttpd/src/daemon/https/tls/auth_rsa.c 2008-10-13 03:56:53 UTC
(rev 7772)
@@ -31,7 +31,6 @@
#include "gnutls_errors.h"
#include "gnutls_dh.h"
#include "gnutls_num.h"
-#include "libtasn1.h"
#include "gnutls_datum.h"
#include "auth_cert.h"
#include <gnutls_pk.h>
Modified: libmicrohttpd/src/daemon/https/tls/auth_rsa_export.c
===================================================================
--- libmicrohttpd/src/daemon/https/tls/auth_rsa_export.c 2008-10-13
02:03:44 UTC (rev 7771)
+++ libmicrohttpd/src/daemon/https/tls/auth_rsa_export.c 2008-10-13
03:56:53 UTC (rev 7772)
@@ -31,7 +31,6 @@
#include "gnutls_errors.h"
#include "gnutls_dh.h"
#include "gnutls_num.h"
-#include "libtasn1.h"
#include "gnutls_datum.h"
#include "auth_cert.h"
#include <gnutls_pk.h>
Modified: libmicrohttpd/src/daemon/https/tls/gnutls_cert.c
===================================================================
--- libmicrohttpd/src/daemon/https/tls/gnutls_cert.c 2008-10-13 02:03:44 UTC
(rev 7771)
+++ libmicrohttpd/src/daemon/https/tls/gnutls_cert.c 2008-10-13 03:56:53 UTC
(rev 7772)
@@ -30,7 +30,6 @@
#include <gnutls_errors.h>
#include <auth_cert.h>
#include <gnutls_cert.h>
-#include <libtasn1.h>
#include <gnutls_datum.h>
#include <gnutls_mpi.h>
#include <gnutls_global.h>
Modified: libmicrohttpd/src/daemon/https/tls/gnutls_cert.h
===================================================================
--- libmicrohttpd/src/daemon/https/tls/gnutls_cert.h 2008-10-13 02:03:44 UTC
(rev 7771)
+++ libmicrohttpd/src/daemon/https/tls/gnutls_cert.h 2008-10-13 03:56:53 UTC
(rev 7772)
@@ -26,7 +26,6 @@
# define GNUTLS_CERT_H
#include <gnutls_pk.h>
-#include <libtasn1.h>
#include "x509.h"
#define MAX_PUBLIC_PARAMS_SIZE 4 /* ok for RSA and DSA */
Modified: libmicrohttpd/src/daemon/https/tls/gnutls_constate.c
===================================================================
--- libmicrohttpd/src/daemon/https/tls/gnutls_constate.c 2008-10-13
02:03:44 UTC (rev 7771)
+++ libmicrohttpd/src/daemon/https/tls/gnutls_constate.c 2008-10-13
03:56:53 UTC (rev 7772)
@@ -59,9 +59,6 @@
MHD__gnutls_set_keys (MHD_gtls_session_t session, int hash_size, int IV_size,
int key_size, int export_flag)
{
-
-/* FIXME: This function is too long
- */
opaque *key_block;
opaque rnd[2 * TLS_RANDOM_SIZE];
opaque rrnd[2 * TLS_RANDOM_SIZE];
Modified: libmicrohttpd/src/daemon/https/tls/gnutls_handshake.c
===================================================================
--- libmicrohttpd/src/daemon/https/tls/gnutls_handshake.c 2008-10-13
02:03:44 UTC (rev 7771)
+++ libmicrohttpd/src/daemon/https/tls/gnutls_handshake.c 2008-10-13
03:56:53 UTC (rev 7772)
@@ -1012,7 +1012,7 @@
MHD__gnutls_handshake_log ("HSK[%x]: %s was sent [%ld bytes]\n",
session, MHD__gnutls_handshake2str (type),
- datasize);
+ (long) datasize);
MHD_gnutls_afree (data);
Modified: libmicrohttpd/src/daemon/https/tls/gnutls_mpi.h
===================================================================
--- libmicrohttpd/src/daemon/https/tls/gnutls_mpi.h 2008-10-13 02:03:44 UTC
(rev 7771)
+++ libmicrohttpd/src/daemon/https/tls/gnutls_mpi.h 2008-10-13 03:56:53 UTC
(rev 7772)
@@ -27,8 +27,6 @@
# include <gnutls_int.h>
# include <gcrypt.h>
-# include <libtasn1.h>
-/* lgl */
# include "gc.h"
typedef gcry_mpi_t mpi_t;
Modified: libmicrohttpd/src/daemon/https/tls/gnutls_sig.c
===================================================================
--- libmicrohttpd/src/daemon/https/tls/gnutls_sig.c 2008-10-13 02:03:44 UTC
(rev 7771)
+++ libmicrohttpd/src/daemon/https/tls/gnutls_sig.c 2008-10-13 03:56:53 UTC
(rev 7772)
@@ -27,7 +27,6 @@
#include <x509_b64.h>
#include <auth_cert.h>
#include <gnutls_cert.h>
-#include <libtasn1.h>
#include <gnutls_datum.h>
#include <gnutls_mpi.h>
#include <gnutls_global.h>
Modified: libmicrohttpd/src/daemon/https/tls/gnutls_x509.c
===================================================================
--- libmicrohttpd/src/daemon/https/tls/gnutls_x509.c 2008-10-13 02:03:44 UTC
(rev 7771)
+++ libmicrohttpd/src/daemon/https/tls/gnutls_x509.c 2008-10-13 03:56:53 UTC
(rev 7772)
@@ -29,7 +29,6 @@
#include <auth_cert.h>
#include "gnutls_dh.h"
#include "gnutls_num.h"
-#include "libtasn1.h"
#include "gnutls_datum.h"
#include <gnutls_pk.h>
#include <gnutls_algorithms.h>
@@ -141,8 +140,7 @@
*/
peer_certificate_list_size = info->ncerts;
peer_certificate_list =
- MHD_gnutls_calloc (1,
- peer_certificate_list_size *
+ MHD_gnutls_calloc (peer_certificate_list_size,
sizeof (MHD_gnutls_x509_crt_t));
if (peer_certificate_list == NULL)
{
Modified: libmicrohttpd/src/daemon/https/x509/common.c
===================================================================
--- libmicrohttpd/src/daemon/https/x509/common.c 2008-10-13 02:03:44 UTC
(rev 7771)
+++ libmicrohttpd/src/daemon/https/x509/common.c 2008-10-13 03:56:53 UTC
(rev 7772)
@@ -410,39 +410,33 @@
{
char *res;
char escaped[MAX_STRING_LEN];
+ unsigned int size;
if (2 * data_size + 1 > MAX_STRING_LEN)
{
MHD_gnutls_assert ();
return GNUTLS_E_INTERNAL_ERROR;
}
-
res = MHD_gtls_bin2hex (data, data_size, escaped, sizeof (escaped));
-
- if (res)
+ if (!res)
{
- unsigned int size = strlen (res) + 1;
- if (size + 1 > *sizeof_out)
- {
- *sizeof_out = size;
- return GNUTLS_E_SHORT_MEMORY_BUFFER;
- }
- *sizeof_out = size; /* -1 for the null +1 for the '#' */
-
- if (out)
- {
- strcpy ((char *) out, "#");
- strcat ((char *) out, res);
- }
-
- return 0;
- }
- else
- {
MHD_gnutls_assert ();
return GNUTLS_E_INTERNAL_ERROR;
}
-
+
+ size = strlen (res) + 1;
+ if (size + 1 > *sizeof_out)
+ {
+ *sizeof_out = size;
+ return GNUTLS_E_SHORT_MEMORY_BUFFER;
+ }
+ *sizeof_out = size; /* -1 for the null +1 for the '#' */
+
+ if (out)
+ {
+ strcpy ((char*) out, "#");
+ strcat ((char*) out, res);
+ }
return 0;
}
Modified: libmicrohttpd/src/daemon/https/x509/x509.h
===================================================================
--- libmicrohttpd/src/daemon/https/x509/x509.h 2008-10-13 02:03:44 UTC (rev
7771)
+++ libmicrohttpd/src/daemon/https/x509/x509.h 2008-10-13 03:56:53 UTC (rev
7772)
@@ -33,6 +33,7 @@
#endif
#include <gnutls.h>
+#include <libtasn1.h>
#include "gnutls_mpi.h"
/* Some OIDs usually found in Distinguished names, or
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7772 - in libmicrohttpd/src/daemon/https: tls x509,
gnunet <=