summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2013-01-29 21:35:11 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2013-01-29 21:38:04 +0100
commit3b222117c04e59aef0617c3b7ec3c220ba556c70 (patch)
treea1f0d0030c6a0dcdf6440ede9afbf1b84fb48036
parent8c198bec34b7be3607cc7dafb010237a5babc745 (diff)
downloadgnutls-3b222117c04e59aef0617c3b7ec3c220ba556c70.tar.gz
xssl API moved to xssl library
-rw-r--r--NEWS3
-rw-r--r--lib/Makefile.am22
-rw-r--r--m4/hooks.m44
3 files changed, 27 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 2fde75cb7d..ebd5748173 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,9 @@ in a template from an RFC4514 string.
** danetool: Added options: --dlv and --insecure. Suggested by Paul Wouters.
+** libgnutls-xssl: Added an experimental TLS library with an very simple
+API.
+
** libgnutls: DN variable 'T' was expanded to 'title'.
** libgnutls: Added functions to directly set the DN in a certificate
diff --git a/lib/Makefile.am b/lib/Makefile.am
index b313120442..3ea15f3388 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -78,7 +78,7 @@ COBJECTS = gnutls_range.c gnutls_record.c \
gnutls_rsa_export.c gnutls_helper.c gnutls_supplemental.c \
random.c crypto-api.c gnutls_privkey.c gnutls_pcert.c \
gnutls_pubkey.c locks.c gnutls_dtls.c system_override.c \
- crypto-backend.c verify-tofu.c pin.c tpm.c xssl.c xssl_getline.c
+ crypto-backend.c verify-tofu.c pin.c tpm.c
if ENABLE_PKCS11
COBJECTS += pkcs11.c pkcs11_privkey.c pkcs11_write.c pkcs11_secret.c
@@ -100,7 +100,7 @@ HFILES = abstract_int.h debug.h gnutls_compress.h gnutls_cipher.h \
gnutls_state.h gnutls_x509.h crypto-backend.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 gnutls_ecc.h pin.h xssl.h
+ locks.h gnutls_mbuffers.h gnutls_ecc.h pin.h
if ENABLE_PKCS11
HFILES += pkcs11_int.h
@@ -183,3 +183,21 @@ pkix_asn1_tab.c: $(srcdir)/pkix.asn
gnutls_asn1_tab.c: $(srcdir)/gnutls.asn
-asn1Parser $(srcdir)/gnutls.asn gnutls_asn1_tab.c
+
+
+libgnutls_xssl_la_LDFLAGS = -no-undefined
+
+lib_LTLIBRARIES += libgnutls-xssl.la
+
+libgnutls_xssl_la_SOURCES = xssl.c xssl_getline.c xssl.h
+
+libgnutls_xssl_la_LIBADD = ../gl/libgnu.la ../lib/libgnutls.la
+
+libgnutls_xssl_la_LDFLAGS += -version-info $(LT_XSSL_CURRENT):$(LT_XSSL_REVISION):$(LT_XSSL_AGE)
+
+if HAVE_LD_OUTPUT_DEF
+libgnutls_xssl_la_LDFLAGS += \
+ -Wl,--output-def,libgnutls-xssl-$(DLL_VERSION).def
+libgnutls-xssl-$(DLL_VERSION).def: libgnutls-xssl.la
+defexec_DATA += libgnutls-xssl-$(DLL_VERSION).def
+endif
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index 439786c7e3..55bcf84753 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -51,6 +51,10 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
AC_SUBST(LT_DANE_REVISION, 0)
AC_SUBST(LT_DANE_AGE, 2)
+ AC_SUBST(LT_XSSL_CURRENT, 0)
+ AC_SUBST(LT_XSSL_REVISION, 0)
+ AC_SUBST(LT_XSSL_AGE, 0)
+
AC_SUBST(CXX_LT_CURRENT, 29)
AC_SUBST(CXX_LT_REVISION, 0)
AC_SUBST(CXX_LT_AGE, 1)