[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_2_99_0-52-ge08fe33
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_2_99_0-52-ge08fe33 |
|
Date: |
Fri, 15 Apr 2011 22:49:03 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".
http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=e08fe335731fe037ebb374950d06f044bc844c8f
The branch, master has been updated
via e08fe335731fe037ebb374950d06f044bc844c8f (commit)
via 9fc1e40accd9c74cfd409b563bf29a700cdb8fcc (commit)
via fa5cfc8beb6a6fe9fffb06baaf92ae9d900c6105 (commit)
via 8b038ab976011a715c495207a750e7cc42165d06 (commit)
from 426cc51abcf68c4e9291c283214fff9ff955cfda (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e08fe335731fe037ebb374950d06f044bc844c8f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Apr 16 00:48:54 2011 +0200
documented directories.
commit 9fc1e40accd9c74cfd409b563bf29a700cdb8fcc
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Apr 16 00:48:46 2011 +0200
Moved cryptodev to accelerated/
commit fa5cfc8beb6a6fe9fffb06baaf92ae9d900c6105
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Apr 16 00:39:15 2011 +0200
Session tickets are included unconditionally.
commit 8b038ab976011a715c495207a750e7cc42165d06
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Apr 16 00:38:08 2011 +0200
The auth_ and ext_ files were moved to respective directories.
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +
lib/Makefile.am | 48 ++++++++-----------
lib/README | 15 ++++++-
lib/accelerated/Makefile.am | 4 +-
lib/{ => accelerated}/cryptodev.c | 0
.../cryptodev.h} | 0
lib/{openpgp => auth}/Makefile.am | 10 ++--
lib/{auth_anon.c => auth/anon.c} | 4 +-
lib/{auth_anon.h => auth/anon.h} | 2 +-
lib/{auth_cert.c => auth/cert.c} | 4 +-
lib/{auth_cert.h => auth/cert.h} | 2 +-
lib/{auth_dh_common.c => auth/dh_common.c} | 4 +-
lib/{auth_dh_common.h => auth/dh_common.h} | 0
lib/{auth_dhe.c => auth/dhe.c} | 4 +-
lib/{auth_dhe_psk.c => auth/dhe_psk.c} | 4 +-
lib/{auth_psk.c => auth/psk.c} | 4 +-
lib/{auth_psk.h => auth/psk.h} | 2 +-
lib/{auth_psk_passwd.c => auth/psk_passwd.c} | 4 +-
lib/{auth_psk_passwd.h => auth/psk_passwd.h} | 0
lib/{auth_rsa.c => auth/rsa.c} | 2 +-
lib/{auth_rsa_export.c => auth/rsa_export.c} | 2 +-
lib/{auth_srp.c => auth/srp.c} | 6 +-
lib/{auth_srp.h => auth/srp.h} | 0
lib/{auth_srp_passwd.c => auth/srp_passwd.c} | 4 +-
lib/{auth_srp_passwd.h => auth/srp_passwd.h} | 0
lib/{auth_srp_rsa.c => auth/srp_rsa.c} | 8 ++--
lib/{auth_srp_sb64.c => auth/srp_sb64.c} | 2 +-
lib/{openpgp => ext}/Makefile.am | 11 +++--
lib/{ext_cert_type.c => ext/cert_type.c} | 2 +-
lib/{ext_cert_type.h => ext/cert_type.h} | 0
lib/{ext_max_record.c => ext/max_record.c} | 2 +-
lib/{ext_max_record.h => ext/max_record.h} | 0
.../safe_renegotiation.c} | 2 +-
.../safe_renegotiation.h} | 0
lib/{ext_server_name.c => ext/server_name.c} | 2 +-
lib/{ext_server_name.h => ext/server_name.h} | 0
lib/{ext_session_ticket.c => ext/session_ticket.c} | 2 +-
lib/{ext_session_ticket.h => ext/session_ticket.h} | 0
lib/{ext_signature.c => ext/signature.c} | 2 +-
lib/{ext_signature.h => ext/signature.h} | 0
lib/{ext_srp.c => ext/srp.c} | 4 +-
lib/{ext_srp.h => ext/srp.h} | 0
lib/gnutls_anon_cred.c | 2 +-
lib/gnutls_auth.c | 6 +-
lib/gnutls_cert.c | 2 +-
lib/gnutls_extensions.c | 18 +++----
lib/gnutls_global.c | 2 +-
lib/gnutls_handshake.c | 16 +++----
lib/gnutls_psk.c | 4 +-
lib/gnutls_record.c | 2 +-
lib/gnutls_session_pack.c | 8 ++--
lib/gnutls_sig.c | 4 +-
lib/gnutls_srp.c | 4 +-
lib/gnutls_state.c | 6 +-
lib/gnutls_ui.c | 8 ++--
lib/gnutls_x509.c | 2 +-
lib/openpgp/gnutls_openpgp.h | 2 +-
m4/hooks.m4 | 14 ------
58 files changed, 126 insertions(+), 138 deletions(-)
rename lib/{ => accelerated}/cryptodev.c (100%)
rename lib/{gnutls_cryptodev.h => accelerated/cryptodev.h} (100%)
copy lib/{openpgp => auth}/Makefile.am (82%)
rename lib/{auth_anon.c => auth/anon.c} (98%)
rename lib/{auth_anon.h => auth/anon.h} (98%)
rename lib/{auth_cert.c => auth/cert.c} (99%)
rename lib/{auth_cert.h => auth/cert.h} (99%)
rename lib/{auth_dh_common.c => auth/dh_common.c} (99%)
rename lib/{auth_dh_common.h => auth/dh_common.h} (100%)
rename lib/{auth_dhe.c => auth/dhe.c} (99%)
rename lib/{auth_dhe_psk.c => auth/dhe_psk.c} (99%)
rename lib/{auth_psk.c => auth/psk.c} (99%)
rename lib/{auth_psk.h => auth/psk.h} (98%)
rename lib/{auth_psk_passwd.c => auth/psk_passwd.c} (98%)
rename lib/{auth_psk_passwd.h => auth/psk_passwd.h} (100%)
rename lib/{auth_rsa.c => auth/rsa.c} (99%)
rename lib/{auth_rsa_export.c => auth/rsa_export.c} (99%)
rename lib/{auth_srp.c => auth/srp.c} (99%)
rename lib/{auth_srp.h => auth/srp.h} (100%)
rename lib/{auth_srp_passwd.c => auth/srp_passwd.c} (99%)
rename lib/{auth_srp_passwd.h => auth/srp_passwd.h} (100%)
rename lib/{auth_srp_rsa.c => auth/srp_rsa.c} (98%)
rename lib/{auth_srp_sb64.c => auth/srp_sb64.c} (99%)
copy lib/{openpgp => ext}/Makefile.am (82%)
rename lib/{ext_cert_type.c => ext/cert_type.c} (99%)
rename lib/{ext_cert_type.h => ext/cert_type.h} (100%)
rename lib/{ext_max_record.c => ext/max_record.c} (99%)
rename lib/{ext_max_record.h => ext/max_record.h} (100%)
rename lib/{ext_safe_renegotiation.c => ext/safe_renegotiation.c} (99%)
rename lib/{ext_safe_renegotiation.h => ext/safe_renegotiation.h} (100%)
rename lib/{ext_server_name.c => ext/server_name.c} (99%)
rename lib/{ext_server_name.h => ext/server_name.h} (100%)
rename lib/{ext_session_ticket.c => ext/session_ticket.c} (99%)
rename lib/{ext_session_ticket.h => ext/session_ticket.h} (100%)
rename lib/{ext_signature.c => ext/signature.c} (99%)
rename lib/{ext_signature.h => ext/signature.h} (100%)
rename lib/{ext_srp.c => ext/srp.c} (99%)
rename lib/{ext_srp.h => ext/srp.h} (100%)
diff --git a/configure.ac b/configure.ac
index bf1d391..5dc81a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -415,6 +415,8 @@ AC_CONFIG_FILES([
tests/suite/Makefile
lib/accelerated/Makefile
lib/accelerated/intel/Makefile
+ lib/ext/Makefile
+ lib/auth/Makefile
])
AC_OUTPUT
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 35d1d95..0e7751e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -24,7 +24,7 @@
ACLOCAL_AMFLAGS = -I ../m4 -I ../gl/m4
EXTRA_DIST = pakchois/README
-SUBDIRS = includes x509 accelerated
+SUBDIRS = includes x509 accelerated auth ext
if ENABLE_MINITASN1
SUBDIRS += minitasn1
endif
@@ -55,30 +55,24 @@ DISTCLEANFILES = $(pkgconfig_DATA)
lib_LTLIBRARIES = libgnutls.la
-SRP_COBJECTS = ext_srp.c gnutls_srp.c auth_srp.c auth_srp_passwd.c \
- auth_srp_sb64.c auth_srp_rsa.c
+SRP_COBJECTS = gnutls_srp.c
-PSK_COBJECTS = auth_psk.c auth_psk_passwd.c gnutls_psk.c \
- auth_dhe_psk.c
-
-SESSION_TICKET_COBJECTS = ext_session_ticket.c
+PSK_COBJECTS = gnutls_psk.c
COBJECTS = gnutls_record.c gnutls_compress.c debug.c gnutls_cipher.c \
gnutls_mbuffers.c gnutls_buffers.c gnutls_handshake.c gnutls_num.c \
gnutls_errors.c gnutls_algorithms.c gnutls_dh.c gnutls_kx.c \
gnutls_priority.c gnutls_hash_int.c gnutls_cipher_int.c \
- gnutls_session.c gnutls_db.c x509_b64.c auth_anon.c \
+ gnutls_session.c gnutls_db.c x509_b64.c \
gnutls_extensions.c gnutls_auth.c gnutls_v2_compat.c \
- gnutls_datum.c auth_rsa.c gnutls_session_pack.c gnutls_mpi.c \
+ gnutls_datum.c gnutls_session_pack.c gnutls_mpi.c \
gnutls_pk.c gnutls_cert.c gnutls_global.c gnutls_constate.c \
gnutls_anon_cred.c pkix_asn1_tab.c gnutls_asn1_tab.c \
- gnutls_mem.c auth_cert.c gnutls_ui.c gnutls_sig.c auth_dhe.c \
- gnutls_dh_primes.c ext_max_record.c gnutls_alert.c \
- gnutls_str.c gnutls_state.c gnutls_x509.c ext_cert_type.c \
- gnutls_rsa_export.c auth_rsa_export.c ext_server_name.c \
- auth_dh_common.c gnutls_helper.c gnutls_supplemental.c \
- crypto.c random.c ext_signature.c cryptodev.c system.c \
- crypto-api.c ext_safe_renegotiation.c gnutls_privkey.c \
+ gnutls_mem.c gnutls_ui.c gnutls_sig.c \
+ gnutls_dh_primes.c gnutls_alert.c system.c \
+ gnutls_str.c gnutls_state.c gnutls_x509.c gnutls_rsa_export.c \
+ gnutls_helper.c gnutls_supplemental.c crypto.c random.c \
+ crypto-api.c gnutls_privkey.c \
pkcs11.c pkcs11_privkey.c gnutls_pubkey.c pkcs11_write.c locks.c \
pkcs11_secret.c hash.c gnutls_dtls.c system_override.c
@@ -93,18 +87,15 @@ HFILES = abstract_int.h debug.h gnutls_compress.h
gnutls_cipher.h \
gnutls_buffers.h gnutls_errors.h gnutls_int.h gnutls_dtls.h \
gnutls_handshake.h gnutls_num.h gnutls_algorithms.h \
gnutls_dh.h gnutls_kx.h gnutls_hash_int.h gnutls_cipher_int.h \
- gnutls_db.h gnutls_auth.h auth_anon.h gnutls_extensions.h \
- x509_b64.h gnutls_v2_compat.h gnutls_datum.h auth_cert.h \
+ gnutls_db.h gnutls_auth.h gnutls_extensions.h \
+ x509_b64.h gnutls_v2_compat.h gnutls_datum.h \
gnutls_mpi.h gnutls_pk.h gnutls_record.h gnutls_cert.h \
gnutls_constate.h gnutls_global.h gnutls_sig.h gnutls_mem.h \
- ext_max_record.h gnutls_session_pack.h gnutls_str.h \
- gnutls_state.h gnutls_x509.h ext_cert_type.h \
- gnutls_rsa_export.h ext_server_name.h auth_dh_common.h \
- ext_srp.h gnutls_srp.h auth_srp.h auth_srp_passwd.h \
- gnutls_helper.h auth_psk.h auth_psk_passwd.h \
- gnutls_supplemental.h crypto.h random.h system.h \
- ext_session_ticket.h ext_signature.h gnutls_cryptodev.h \
- ext_safe_renegotiation.h locks.h gnutls_mbuffers.h pkcs11_int.h \
+ gnutls_session_pack.h gnutls_str.h \
+ gnutls_state.h gnutls_x509.h \
+ gnutls_rsa_export.h gnutls_srp.h auth/srp.h auth/srp_passwd.h \
+ gnutls_helper.h gnutls_supplemental.h crypto.h random.h system.h\
+ locks.h gnutls_mbuffers.h pkcs11_int.h \
hash.h
COBJECTS+=pakchois/pakchois.c pakchois/errors.c pakchois/dlopen.c
@@ -113,14 +104,15 @@ HFILES+=pakchois/pakchois.h pakchois/pakchois11.h
pakchois/dlopen.h
# Separate so we can create the documentation
libgnutls_la_SOURCES = $(HFILES) $(COBJECTS) $(SRP_COBJECTS) \
- $(PSK_COBJECTS) $(SESSION_TICKET_COBJECTS) \
+ $(PSK_COBJECTS) \
gnutls.asn pkix.asn libgnutls.map
libgnutls_la_LDFLAGS = -no-undefined \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
libgnutls_la_LIBADD = ../gl/libgnu.la x509/libgnutls_x509.la \
- accelerated/libaccelerated.la \
+ accelerated/libaccelerated.la ext/libgnutls_ext.la \
+ auth/libgnutls_auth.la \
$(LTLIBZ) $(LTLIBINTL) $(LIBSOCKET) $(LTLIBDL)
if ENABLE_OPENPGP
diff --git a/lib/README b/lib/README
index 042fa94..6ebba8f 100644
--- a/lib/README
+++ b/lib/README
@@ -1 +1,14 @@
-See ../README.
+ext/ -> Implementation of TLS extensions
+auth/ -> Implementation of TLS authentication methods (DHE, SRP etc.)
+accelerated/ -> Implementation of cipher acceleration
+
+Certificate support:
+x509/ -> Implementation of GnuTLS X.509 certificate support (and more)
+openpgp/ -> Implementation of GnuTLS openpgp support
+opencdk/ -> Implementation of low level openpgp packet parsing
+minitasn1 -> ASN.1 structure parsing library
+pakchois/ -> PKCS #11 wrapper library
+
+Crypto backends:
+nettle/ -> -> The nettle crypto back-end
+gcrypt/ -> -> The libgcrypt crypto back-end
diff --git a/lib/accelerated/Makefile.am b/lib/accelerated/Makefile.am
index 6cccae5..7657ab2 100644
--- a/lib/accelerated/Makefile.am
+++ b/lib/accelerated/Makefile.am
@@ -35,8 +35,8 @@ endif
noinst_LTLIBRARIES = libaccelerated.la
-EXTRA_DIST = x86.h accelerated.h
-libaccelerated_la_SOURCES = accelerated.c
+EXTRA_DIST = x86.h accelerated.h gnutls_cryptodev.h
+libaccelerated_la_SOURCES = accelerated.c cryptodev.c
libaccelerated_la_LIBADD =
if TRY_X86_OPTIMIZATIONS
diff --git a/lib/cryptodev.c b/lib/accelerated/cryptodev.c
similarity index 100%
rename from lib/cryptodev.c
rename to lib/accelerated/cryptodev.c
diff --git a/lib/gnutls_cryptodev.h b/lib/accelerated/cryptodev.h
similarity index 100%
rename from lib/gnutls_cryptodev.h
rename to lib/accelerated/cryptodev.h
diff --git a/lib/openpgp/Makefile.am b/lib/auth/Makefile.am
similarity index 82%
copy from lib/openpgp/Makefile.am
copy to lib/auth/Makefile.am
index 4f00d70..c459ffe 100644
--- a/lib/openpgp/Makefile.am
+++ b/lib/auth/Makefile.am
@@ -33,9 +33,9 @@ if ENABLE_MINITASN1
AM_CPPFLAGS += -I$(srcdir)/../minitasn1
endif
-noinst_LTLIBRARIES = libgnutls_openpgp.la
+noinst_LTLIBRARIES = libgnutls_auth.la
-COBJECTS = pgp.c pgpverify.c extras.c compat.c privkey.c output.c \
- gnutls_openpgp.c
-
-libgnutls_openpgp_la_SOURCES = $(COBJECTS) openpgp_int.h gnutls_openpgp.h
+libgnutls_auth_la_SOURCES = anon.c cert.c dh_common.c dhe.c \
+ dhe_psk.c psk.c psk_passwd.c rsa.c rsa_export.c srp.c \
+ srp_passwd.c srp_rsa.c srp_sb64.c anon.h cert.h dh_common.h \
+ psk.h psk_passwd.h srp.h srp_passwd.h
diff --git a/lib/auth_anon.c b/lib/auth/anon.c
similarity index 98%
rename from lib/auth_anon.c
rename to lib/auth/anon.c
index e9ee2fc..ef3b910 100644
--- a/lib/auth_anon.c
+++ b/lib/auth/anon.c
@@ -35,11 +35,11 @@
#include "gnutls_auth.h"
#include "gnutls_errors.h"
#include "gnutls_dh.h"
-#include "auth_anon.h"
+#include "auth/anon.h"
#include "gnutls_num.h"
#include "gnutls_mpi.h"
#include <gnutls_state.h>
-#include <auth_dh_common.h>
+#include <auth/dh_common.h>
static int gen_anon_server_kx (gnutls_session_t, gnutls_buffer_st*);
static int proc_anon_client_kx (gnutls_session_t, opaque *, size_t);
diff --git a/lib/auth_anon.h b/lib/auth/anon.h
similarity index 98%
rename from lib/auth_anon.h
rename to lib/auth/anon.h
index a375c3e..ab5063d 100644
--- a/lib/auth_anon.h
+++ b/lib/auth/anon.h
@@ -25,7 +25,7 @@
/* this is not to be included by gnutls_anon.c */
#include <gnutls_auth.h>
-#include <auth_dh_common.h>
+#include <auth/dh_common.h>
typedef struct gnutls_anon_server_credentials_st
{
diff --git a/lib/auth_cert.c b/lib/auth/cert.c
similarity index 99%
rename from lib/auth_cert.c
rename to lib/auth/cert.c
index c760e50..2f20f0e 100644
--- a/lib/auth_cert.c
+++ b/lib/auth/cert.c
@@ -31,12 +31,12 @@
#include "gnutls_auth.h"
#include "gnutls_errors.h"
#include <gnutls_cert.h>
-#include <auth_cert.h>
+#include <auth/cert.h>
#include "gnutls_dh.h"
#include "gnutls_num.h"
#include "libtasn1.h"
#include "gnutls_datum.h"
-#include "ext_signature.h"
+#include "ext/signature.h"
#include <gnutls_pk.h>
#include <gnutls_algorithms.h>
#include <gnutls_global.h>
diff --git a/lib/auth_cert.h b/lib/auth/cert.h
similarity index 99%
rename from lib/auth_cert.h
rename to lib/auth/cert.h
index 71ecdfd..045525b 100644
--- a/lib/auth_cert.h
+++ b/lib/auth/cert.h
@@ -27,7 +27,7 @@
#define AUTH_CERT_H
#include "gnutls_cert.h"
#include "gnutls_auth.h"
-#include "auth_dh_common.h"
+#include <auth/dh_common.h>
#include "x509/x509_int.h"
#include "openpgp/openpgp_int.h"
#include <gnutls/abstract.h>
diff --git a/lib/auth_dh_common.c b/lib/auth/dh_common.c
similarity index 99%
rename from lib/auth_dh_common.c
rename to lib/auth/dh_common.c
index 7f45a5b..d5c3506 100644
--- a/lib/auth_dh_common.c
+++ b/lib/auth/dh_common.c
@@ -37,9 +37,9 @@
#include <gnutls_datum.h>
#include <gnutls_x509.h>
#include <gnutls_state.h>
-#include <auth_dh_common.h>
+#include <auth/dh_common.h>
#include <gnutls_algorithms.h>
-#include <auth_psk.h>
+#include <auth/psk.h>
/* Frees the dh_info_st structure.
*/
diff --git a/lib/auth_dh_common.h b/lib/auth/dh_common.h
similarity index 100%
rename from lib/auth_dh_common.h
rename to lib/auth/dh_common.h
diff --git a/lib/auth_dhe.c b/lib/auth/dhe.c
similarity index 99%
rename from lib/auth_dhe.c
rename to lib/auth/dhe.c
index 0180fee..ca0a235 100644
--- a/lib/auth_dhe.c
+++ b/lib/auth/dhe.c
@@ -36,10 +36,10 @@
#include "gnutls_sig.h"
#include <gnutls_datum.h>
#include <gnutls_algorithms.h>
-#include <auth_cert.h>
+#include <auth/cert.h>
#include <gnutls_x509.h>
#include <gnutls_state.h>
-#include <auth_dh_common.h>
+#include <auth/dh_common.h>
static int gen_dhe_server_kx (gnutls_session_t, gnutls_buffer_st*);
static int proc_dhe_server_kx (gnutls_session_t, opaque *, size_t);
diff --git a/lib/auth_dhe_psk.c b/lib/auth/dhe_psk.c
similarity index 99%
rename from lib/auth_dhe_psk.c
rename to lib/auth/dhe_psk.c
index ac1a5bc..c73631f 100644
--- a/lib/auth_dhe_psk.c
+++ b/lib/auth/dhe_psk.c
@@ -33,11 +33,11 @@
#include "gnutls_auth.h"
#include "gnutls_errors.h"
#include "gnutls_dh.h"
-#include "auth_psk.h"
+#include <auth/psk.h>
#include "gnutls_num.h"
#include "gnutls_mpi.h"
#include <gnutls_state.h>
-#include <auth_dh_common.h>
+#include <auth/dh_common.h>
#include <gnutls_datum.h>
static int gen_psk_server_kx (gnutls_session_t, gnutls_buffer_st*);
diff --git a/lib/auth_psk.c b/lib/auth/psk.c
similarity index 99%
rename from lib/auth_psk.c
rename to lib/auth/psk.c
index e3d07d6..a0d4dc4 100644
--- a/lib/auth_psk.c
+++ b/lib/auth/psk.c
@@ -31,8 +31,8 @@
#include "gnutls_auth.h"
#include "debug.h"
#include "gnutls_num.h"
-#include <auth_psk.h>
-#include <auth_psk_passwd.h>
+#include <auth/psk.h>
+#include <auth/psk_passwd.h>
#include <gnutls_str.h>
#include <gnutls_datum.h>
diff --git a/lib/auth_psk.h b/lib/auth/psk.h
similarity index 98%
rename from lib/auth_psk.h
rename to lib/auth/psk.h
index 87d6a32..9a62248 100644
--- a/lib/auth_psk.h
+++ b/lib/auth/psk.h
@@ -26,7 +26,7 @@
#define AUTH_PSK_H
#include <gnutls_auth.h>
-#include <auth_dh_common.h>
+#include <auth/dh_common.h>
typedef struct gnutls_psk_client_credentials_st
{
diff --git a/lib/auth_psk_passwd.c b/lib/auth/psk_passwd.c
similarity index 98%
rename from lib/auth_psk_passwd.c
rename to lib/auth/psk_passwd.c
index f91c03f..71437d5 100644
--- a/lib/auth_psk_passwd.c
+++ b/lib/auth/psk_passwd.c
@@ -30,8 +30,8 @@
#include "x509_b64.h"
#include "gnutls_errors.h"
-#include <auth_psk_passwd.h>
-#include "auth_psk.h"
+#include <auth/psk_passwd.h>
+#include <auth/psk.h>
#include "gnutls_auth.h"
#include "gnutls_dh.h"
#include "debug.h"
diff --git a/lib/auth_psk_passwd.h b/lib/auth/psk_passwd.h
similarity index 100%
rename from lib/auth_psk_passwd.h
rename to lib/auth/psk_passwd.h
diff --git a/lib/auth_rsa.c b/lib/auth/rsa.c
similarity index 99%
rename from lib/auth_rsa.c
rename to lib/auth/rsa.c
index a98b8ab..bcb6692 100644
--- a/lib/auth_rsa.c
+++ b/lib/auth/rsa.c
@@ -33,7 +33,7 @@
#include "gnutls_dh.h"
#include "gnutls_num.h"
#include "gnutls_datum.h"
-#include "auth_cert.h"
+#include <auth/cert.h>
#include <gnutls_pk.h>
#include <gnutls_algorithms.h>
#include <gnutls_global.h>
diff --git a/lib/auth_rsa_export.c b/lib/auth/rsa_export.c
similarity index 99%
rename from lib/auth_rsa_export.c
rename to lib/auth/rsa_export.c
index 1d109d3..f27a092 100644
--- a/lib/auth_rsa_export.c
+++ b/lib/auth/rsa_export.c
@@ -33,7 +33,7 @@
#include "gnutls_dh.h"
#include "gnutls_num.h"
#include "gnutls_datum.h"
-#include "auth_cert.h"
+#include <auth/cert.h>
#include <gnutls_pk.h>
#include <gnutls_algorithms.h>
#include <gnutls_global.h>
diff --git a/lib/auth_srp.c b/lib/auth/srp.c
similarity index 99%
rename from lib/auth_srp.c
rename to lib/auth/srp.c
index f5da4de..f46ec1a 100644
--- a/lib/auth_srp.c
+++ b/lib/auth/srp.c
@@ -28,15 +28,15 @@
#ifdef ENABLE_SRP
#include "gnutls_errors.h"
-#include "auth_srp_passwd.h"
+#include <auth/srp_passwd.h>
#include "gnutls_auth.h"
#include "gnutls_auth.h"
#include "gnutls_srp.h"
#include "gnutls_num.h"
-#include "auth_srp.h"
+#include <auth/srp.h>
#include <gnutls_str.h>
#include <gnutls_datum.h>
-#include <ext_srp.h>
+#include <ext/srp.h>
const mod_auth_st srp_auth_struct = {
"SRP",
diff --git a/lib/auth_srp.h b/lib/auth/srp.h
similarity index 100%
rename from lib/auth_srp.h
rename to lib/auth/srp.h
diff --git a/lib/auth_srp_passwd.c b/lib/auth/srp_passwd.c
similarity index 99%
rename from lib/auth_srp_passwd.c
rename to lib/auth/srp_passwd.c
index 370f845..84c703a 100644
--- a/lib/auth_srp_passwd.c
+++ b/lib/auth/srp_passwd.c
@@ -31,8 +31,8 @@
#include "x509_b64.h"
#include "gnutls_errors.h"
-#include <auth_srp_passwd.h>
-#include "auth_srp.h"
+#include <auth/srp_passwd.h>
+#include <auth/srp.h>
#include "gnutls_auth.h"
#include "gnutls_srp.h"
#include "gnutls_dh.h"
diff --git a/lib/auth_srp_passwd.h b/lib/auth/srp_passwd.h
similarity index 100%
rename from lib/auth_srp_passwd.h
rename to lib/auth/srp_passwd.h
diff --git a/lib/auth_srp_rsa.c b/lib/auth/srp_rsa.c
similarity index 98%
rename from lib/auth_srp_rsa.c
rename to lib/auth/srp_rsa.c
index f997c78..bafaf7c 100644
--- a/lib/auth_srp_rsa.c
+++ b/lib/auth/srp_rsa.c
@@ -28,18 +28,18 @@
#ifdef ENABLE_SRP
#include "gnutls_errors.h"
-#include "auth_srp_passwd.h"
+#include <auth/srp_passwd.h>
#include "gnutls_auth.h"
#include "gnutls_auth.h"
#include "gnutls_srp.h"
#include "debug.h"
#include "gnutls_num.h"
-#include "auth_srp.h"
+#include <auth/srp.h>
#include <gnutls_str.h>
-#include <auth_cert.h>
+#include <auth/cert.h>
#include <gnutls_datum.h>
#include <gnutls_sig.h>
-#include <auth_srp.h>
+#include <auth/srp.h>
#include <gnutls_x509.h>
static int gen_srp_cert_server_kx (gnutls_session_t, gnutls_buffer_st*);
diff --git a/lib/auth_srp_sb64.c b/lib/auth/srp_sb64.c
similarity index 99%
rename from lib/auth_srp_sb64.c
rename to lib/auth/srp_sb64.c
index 1ded485..f1ad478 100644
--- a/lib/auth_srp_sb64.c
+++ b/lib/auth/srp_sb64.c
@@ -26,7 +26,7 @@
#include <gnutls_int.h>
#include <gnutls_errors.h>
#include <gnutls_datum.h>
-#include <auth_srp_passwd.h>
+#include <auth/srp_passwd.h>
#ifdef ENABLE_SRP
diff --git a/lib/openpgp/Makefile.am b/lib/ext/Makefile.am
similarity index 82%
copy from lib/openpgp/Makefile.am
copy to lib/ext/Makefile.am
index 4f00d70..a949912 100644
--- a/lib/openpgp/Makefile.am
+++ b/lib/ext/Makefile.am
@@ -33,9 +33,10 @@ if ENABLE_MINITASN1
AM_CPPFLAGS += -I$(srcdir)/../minitasn1
endif
-noinst_LTLIBRARIES = libgnutls_openpgp.la
+noinst_LTLIBRARIES = libgnutls_ext.la
-COBJECTS = pgp.c pgpverify.c extras.c compat.c privkey.c output.c \
- gnutls_openpgp.c
-
-libgnutls_openpgp_la_SOURCES = $(COBJECTS) openpgp_int.h gnutls_openpgp.h
+libgnutls_ext_la_SOURCES = max_record.c cert_type.c \
+ server_name.c signature.c safe_renegotiation.c \
+ max_record.h cert_type.h server_name.h srp.h \
+ session_ticket.h signature.h safe_renegotiation.h \
+ session_ticket.c srp.c
diff --git a/lib/ext_cert_type.c b/lib/ext/cert_type.c
similarity index 99%
rename from lib/ext_cert_type.c
rename to lib/ext/cert_type.c
index 5a03878..e3fa871 100644
--- a/lib/ext_cert_type.c
+++ b/lib/ext/cert_type.c
@@ -30,7 +30,7 @@
#include "gnutls_int.h"
#include "gnutls_errors.h"
#include "gnutls_num.h"
-#include "ext_cert_type.h"
+#include <ext/cert_type.h>
#include <gnutls_state.h>
#include <gnutls_num.h>
diff --git a/lib/ext_cert_type.h b/lib/ext/cert_type.h
similarity index 100%
rename from lib/ext_cert_type.h
rename to lib/ext/cert_type.h
diff --git a/lib/ext_max_record.c b/lib/ext/max_record.c
similarity index 99%
rename from lib/ext_max_record.c
rename to lib/ext/max_record.c
index 195d37a..f4de922 100644
--- a/lib/ext_max_record.c
+++ b/lib/ext/max_record.c
@@ -29,7 +29,7 @@
#include "gnutls_errors.h"
#include "gnutls_num.h"
#include <gnutls_extensions.h>
-#include <ext_max_record.h>
+#include <ext/max_record.h>
static int _gnutls_max_record_recv_params (gnutls_session_t session,
const opaque * data,
diff --git a/lib/ext_max_record.h b/lib/ext/max_record.h
similarity index 100%
rename from lib/ext_max_record.h
rename to lib/ext/max_record.h
diff --git a/lib/ext_safe_renegotiation.c b/lib/ext/safe_renegotiation.c
similarity index 99%
rename from lib/ext_safe_renegotiation.c
rename to lib/ext/safe_renegotiation.c
index a44c1de..f227276 100644
--- a/lib/ext_safe_renegotiation.c
+++ b/lib/ext/safe_renegotiation.c
@@ -23,7 +23,7 @@
*/
#include <gnutls_int.h>
-#include <ext_safe_renegotiation.h>
+#include <ext/safe_renegotiation.h>
#include <gnutls_errors.h>
diff --git a/lib/ext_safe_renegotiation.h b/lib/ext/safe_renegotiation.h
similarity index 100%
rename from lib/ext_safe_renegotiation.h
rename to lib/ext/safe_renegotiation.h
diff --git a/lib/ext_server_name.c b/lib/ext/server_name.c
similarity index 99%
rename from lib/ext_server_name.c
rename to lib/ext/server_name.c
index c223fd8..e89d445 100644
--- a/lib/ext_server_name.c
+++ b/lib/ext/server_name.c
@@ -27,7 +27,7 @@
#include "gnutls_auth.h"
#include "gnutls_errors.h"
#include "gnutls_num.h"
-#include <ext_server_name.h>
+#include <ext/server_name.h>
static int _gnutls_server_name_recv_params (gnutls_session_t session,
const opaque * data,
diff --git a/lib/ext_server_name.h b/lib/ext/server_name.h
similarity index 100%
rename from lib/ext_server_name.h
rename to lib/ext/server_name.h
diff --git a/lib/ext_session_ticket.c b/lib/ext/session_ticket.c
similarity index 99%
rename from lib/ext_session_ticket.c
rename to lib/ext/session_ticket.c
index 92a2c93..34bbad7 100644
--- a/lib/ext_session_ticket.c
+++ b/lib/ext/session_ticket.c
@@ -31,7 +31,7 @@
#include <gnutls_constate.h>
#include <gnutls_session_pack.h>
#include <random.h>
-#include <ext_session_ticket.h>
+#include <ext/session_ticket.h>
#include <gnutls_mbuffers.h>
#include <gnutls_extensions.h>
#include <gnutls_constate.h>
diff --git a/lib/ext_session_ticket.h b/lib/ext/session_ticket.h
similarity index 100%
rename from lib/ext_session_ticket.h
rename to lib/ext/session_ticket.h
diff --git a/lib/ext_signature.c b/lib/ext/signature.c
similarity index 99%
rename from lib/ext_signature.c
rename to lib/ext/signature.c
index f210e84..723ebd3 100644
--- a/lib/ext_signature.c
+++ b/lib/ext/signature.c
@@ -30,7 +30,7 @@
#include "gnutls_int.h"
#include "gnutls_errors.h"
#include "gnutls_num.h"
-#include <ext_signature.h>
+#include <ext/signature.h>
#include <gnutls_state.h>
#include <gnutls_num.h>
#include <gnutls_algorithms.h>
diff --git a/lib/ext_signature.h b/lib/ext/signature.h
similarity index 100%
rename from lib/ext_signature.h
rename to lib/ext/signature.h
diff --git a/lib/ext_srp.c b/lib/ext/srp.c
similarity index 99%
rename from lib/ext_srp.c
rename to lib/ext/srp.c
index ec07fd0..7c80d68 100644
--- a/lib/ext_srp.c
+++ b/lib/ext/srp.c
@@ -24,12 +24,12 @@
*/
#include <gnutls_int.h>
-#include <ext_srp.h>
+#include <ext/srp.h>
#ifdef ENABLE_SRP
#include "gnutls_auth.h"
-#include "auth_srp.h"
+#include <auth/srp.h>
#include "gnutls_errors.h"
#include "gnutls_algorithms.h"
#include <gnutls_num.h>
diff --git a/lib/ext_srp.h b/lib/ext/srp.h
similarity index 100%
rename from lib/ext_srp.h
rename to lib/ext/srp.h
diff --git a/lib/gnutls_anon_cred.c b/lib/gnutls_anon_cred.c
index e97ec32..9757bf3 100644
--- a/lib/gnutls_anon_cred.c
+++ b/lib/gnutls_anon_cred.c
@@ -28,7 +28,7 @@
#ifdef ENABLE_ANON
#include "gnutls_errors.h"
-#include "auth_anon.h"
+#include <auth/anon.h>
#include "gnutls_auth.h"
#include "gnutls_dh.h"
#include "gnutls_num.h"
diff --git a/lib/gnutls_auth.c b/lib/gnutls_auth.c
index a6003af..d2c85ae 100644
--- a/lib/gnutls_auth.c
+++ b/lib/gnutls_auth.c
@@ -28,11 +28,11 @@
#include "gnutls_auth.h"
#include "gnutls_auth.h"
#include "gnutls_algorithms.h"
-#include "auth_cert.h"
-#include "auth_psk.h"
+#include <auth/cert.h>
+#include <auth/psk.h>
+#include <auth/anon.h>
#include <gnutls_datum.h>
-#include "auth_anon.h"
/* The functions here are used in order for authentication algorithms
* to be able to retrieve the needed credentials eg public and private
* key etc.
diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index f3cb28a..04b2543 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -29,7 +29,7 @@
#include <gnutls_int.h>
#include <gnutls_errors.h>
-#include <auth_cert.h>
+#include <auth/cert.h>
#include <gnutls_cert.h>
#include <gnutls_datum.h>
#include <gnutls_mpi.h>
diff --git a/lib/gnutls_extensions.c b/lib/gnutls_extensions.c
index e14abc4..0ea30b1 100644
--- a/lib/gnutls_extensions.c
+++ b/lib/gnutls_extensions.c
@@ -31,14 +31,14 @@
#include "gnutls_int.h"
#include "gnutls_extensions.h"
#include "gnutls_errors.h"
-#include "ext_max_record.h"
-#include <ext_cert_type.h>
-#include <ext_server_name.h>
-#include <ext_srp.h>
-#include <ext_session_ticket.h>
-#include <ext_safe_renegotiation.h>
-#include <ext_signature.h>
-#include <ext_safe_renegotiation.h>
+#include "ext/max_record.h"
+#include <ext/cert_type.h>
+#include <ext/server_name.h>
+#include <ext/srp.h>
+#include <ext/session_ticket.h>
+#include <ext/safe_renegotiation.h>
+#include <ext/signature.h>
+#include <ext/safe_renegotiation.h>
#include <gnutls_num.h>
@@ -330,11 +330,9 @@ _gnutls_ext_init (void)
return ret;
#endif
-#ifdef ENABLE_SESSION_TICKET
ret = _gnutls_ext_register (&ext_mod_session_ticket);
if (ret != GNUTLS_E_SUCCESS)
return ret;
-#endif
ret = _gnutls_ext_register (&ext_mod_sig);
if (ret != GNUTLS_E_SUCCESS)
diff --git a/lib/gnutls_global.c b/lib/gnutls_global.c
index 3c7f263..7a424cc 100644
--- a/lib/gnutls_global.c
+++ b/lib/gnutls_global.c
@@ -31,8 +31,8 @@
#include <gnutls/pkcs11.h>
#include <gnutls_extensions.h> /* for _gnutls_ext_init */
-#include <gnutls_cryptodev.h>
#include <locks.h>
+#include <accelerated/cryptodev.h>
#include <accelerated/accelerated.h>
#include "sockets.h"
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 8260896..a7f6fc6 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -44,17 +44,17 @@
#include "gnutls_supplemental.h"
#include "gnutls_auth.h"
#include "gnutls_v2_compat.h"
-#include "auth_cert.h"
+#include <auth/cert.h>
#include "gnutls_cert.h"
#include "gnutls_constate.h"
#include <gnutls_record.h>
#include <gnutls_state.h>
-#include <ext_srp.h>
-#include <ext_session_ticket.h>
-#include <ext_safe_renegotiation.h>
+#include <ext/srp.h>
+#include <ext/session_ticket.h>
+#include <ext/safe_renegotiation.h>
#include <gnutls_rsa_export.h> /* for gnutls_get_rsa_params() */
-#include <auth_anon.h> /* for gnutls_anon_server_credentials_t */
-#include <auth_psk.h> /* for gnutls_psk_server_credentials_t */
+#include <auth/anon.h> /* for gnutls_anon_server_credentials_t */
+#include <auth/psk.h> /* for gnutls_psk_server_credentials_t */
#include <random.h>
#include <gnutls_dtls.h>
@@ -3046,7 +3046,6 @@ _gnutls_handshake_common (gnutls_session_t session)
ret = _gnutls_recv_handshake_final (session, TRUE);
IMED_RET ("recv handshake final", ret, 1);
-#ifdef ENABLE_SESSION_TICKET
switch (STATE)
{
case STATE0:
@@ -3058,7 +3057,6 @@ _gnutls_handshake_common (gnutls_session_t session)
default:
break;
}
-#endif
ret = _gnutls_send_handshake_final (session, FALSE);
IMED_RET ("send handshake final", ret, 1);
@@ -3076,7 +3074,6 @@ _gnutls_handshake_common (gnutls_session_t session)
ret = _gnutls_send_handshake_final (session, TRUE);
IMED_RET ("send handshake final 2", ret, 1);
-#ifdef ENABLE_SESSION_TICKET
switch (STATE)
{
case STATE0:
@@ -3088,7 +3085,6 @@ _gnutls_handshake_common (gnutls_session_t session)
default:
break;
}
-#endif
ret = _gnutls_recv_handshake_final (session, FALSE);
IMED_RET ("recv handshake final 2", ret, 1);
diff --git a/lib/gnutls_psk.c b/lib/gnutls_psk.c
index c164178..1fe809e 100644
--- a/lib/gnutls_psk.c
+++ b/lib/gnutls_psk.c
@@ -27,12 +27,12 @@
#include <gnutls_int.h>
#include <gnutls_errors.h>
-#include <auth_psk.h>
+#include <auth/psk.h>
#include <gnutls_state.h>
#ifdef ENABLE_PSK
-#include <auth_psk_passwd.h>
+#include <auth/psk_passwd.h>
#include <gnutls_num.h>
#include <gnutls_helper.h>
#include <gnutls_datum.h>
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index ceee3f0..ba83109 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -43,7 +43,7 @@
#include "gnutls_record.h"
#include "gnutls_datum.h"
#include "gnutls_constate.h"
-#include "ext_max_record.h"
+#include "ext/max_record.h"
#include <gnutls_state.h>
#include <gnutls_dtls.h>
#include <gnutls_dh.h>
diff --git a/lib/gnutls_session_pack.c b/lib/gnutls_session_pack.c
index 1f4dec1..d88919c 100644
--- a/lib/gnutls_session_pack.c
+++ b/lib/gnutls_session_pack.c
@@ -29,13 +29,13 @@
#include <gnutls_int.h>
#ifdef ENABLE_SRP
-#include <auth_srp.h>
+#include <auth/srp.h>
#endif
#ifdef ENABLE_PSK
-#include <auth_psk.h>
+#include <auth/psk.h>
#endif
-#include <auth_anon.h>
-#include <auth_cert.h>
+#include <auth/anon.h>
+#include <auth/cert.h>
#include <gnutls_errors.h>
#include <gnutls_auth.h>
#include <gnutls_session_pack.h>
diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index 0932936..c80db8e 100644
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -26,7 +26,7 @@
#include <gnutls_int.h>
#include <gnutls_errors.h>
#include <x509_b64.h>
-#include <auth_cert.h>
+#include <auth/cert.h>
#include <gnutls_algorithms.h>
#include <gnutls_cert.h>
#include <gnutls_datum.h>
@@ -38,7 +38,7 @@
#include <gnutls_sig.h>
#include <gnutls_kx.h>
#include <libtasn1.h>
-#include <ext_signature.h>
+#include <ext/signature.h>
#include <gnutls_state.h>
#include <x509/common.h>
diff --git a/lib/gnutls_srp.c b/lib/gnutls_srp.c
index 6e07854..be35949 100644
--- a/lib/gnutls_srp.c
+++ b/lib/gnutls_srp.c
@@ -25,13 +25,13 @@
#include <gnutls_int.h>
#include <gnutls_errors.h>
-#include <auth_srp.h>
+#include <auth/srp.h>
#include <gnutls_state.h>
#ifdef ENABLE_SRP
#include <gnutls_srp.h>
-#include <auth_srp_passwd.h>
+#include <auth/srp_passwd.h>
#include <gnutls_mpi.h>
#include <gnutls_num.h>
#include <gnutls_helper.h>
diff --git a/lib/gnutls_state.c b/lib/gnutls_state.c
index bce13df..ecd720a 100644
--- a/lib/gnutls_state.c
+++ b/lib/gnutls_state.c
@@ -41,9 +41,9 @@
#include <gnutls_mbuffers.h>
#include <gnutls_state.h>
#include <gnutls_constate.h>
-#include <auth_cert.h>
-#include <auth_anon.h>
-#include <auth_psk.h>
+#include <auth/cert.h>
+#include <auth/anon.h>
+#include <auth/psk.h>
#include <gnutls_algorithms.h>
#include <gnutls_rsa_export.h>
#include <gnutls_extensions.h>
diff --git a/lib/gnutls_ui.c b/lib/gnutls_ui.c
index c2d5b88..c023cde 100644
--- a/lib/gnutls_ui.c
+++ b/lib/gnutls_ui.c
@@ -28,10 +28,10 @@
*/
#include <gnutls_int.h>
-#include <auth_srp.h>
-#include <auth_anon.h>
-#include <auth_cert.h>
-#include <auth_psk.h>
+#include <auth/srp.h>
+#include <auth/anon.h>
+#include <auth/cert.h>
+#include <auth/psk.h>
#include <gnutls_errors.h>
#include <gnutls_auth.h>
#include <gnutls_state.h>
diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index a3afdb9..ef2ba5f 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -27,7 +27,7 @@
#include "gnutls_auth.h"
#include "gnutls_errors.h"
#include <gnutls_cert.h>
-#include <auth_cert.h>
+#include <auth/cert.h>
#include "gnutls_dh.h"
#include "gnutls_num.h"
#include "gnutls_datum.h"
diff --git a/lib/openpgp/gnutls_openpgp.h b/lib/openpgp/gnutls_openpgp.h
index 7816fcd..f9dbed4 100644
--- a/lib/openpgp/gnutls_openpgp.h
+++ b/lib/openpgp/gnutls_openpgp.h
@@ -5,7 +5,7 @@
#ifndef GNUTLS_OPENPGP_LOCAL_H
#define GNUTLS_OPENPGP_LOCAL_H
-#include <auth_cert.h>
+#include <auth/cert.h>
#include <opencdk.h>
#include <gnutls/abstract.h>
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index ce5837f..d99dd82 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -230,20 +230,6 @@ fi
fi
AM_CONDITIONAL(ENABLE_OPENPGP, test "$ac_enable_openpgp" = "yes")
- AC_MSG_CHECKING([whether to disable SessionTicket extension support])
- AC_ARG_ENABLE(session-ticket,
- AS_HELP_STRING([--disable-session-ticket],
- [disable the SessionTicket extension support]),
- ac_session_ticket=no)
- if test x$ac_session_ticket != xno; then
- AC_MSG_RESULT(no)
- AC_DEFINE([ENABLE_SESSION_TICKET], 1, [enable SessionTicket extension])
- else
- ac_full=0
- AC_MSG_RESULT(yes)
- fi
- AM_CONDITIONAL(ENABLE_SESSION_TICKET, test "$ac_enable_session_ticket" !=
"no")
-
# For cryptodev
AC_MSG_CHECKING([whether to add cryptodev support])
AC_ARG_ENABLE(cryptodev,
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_2_99_0-52-ge08fe33,
Nikos Mavrogiannopoulos <=