the idea of using a separate library for x509 stuff was dropped for now.

diff --git a/NEWS b/NEWS
index afa744b6b7e69ecc00178de8e2336dc9cfabfa8e..572fc175ede259446d399872fdbada872a6953ad 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,5 @@
 Version 0.9.3
 - Support for MD2 was dropped. 
-- Only basic X.509 functionality is included in the gnutls library.
-  The rest was moved to the libgnutls-x509.
 - Improved the error logging functions, by adding a level, and
   by allowing debugging messages just by increasing the level.
 - The diffie Hellman ciphersuites are now of higher priority than

diff --git a/doc/tex/funcs.tex b/doc/tex/funcs.tex
index 03c636eebdf739d4bfc4698b1343e2b39dc89986..04ab42e2c8d7f7c9ca6cfa3643d3199e03a1bb30 100644 (file)
--- a/doc/tex/funcs.tex
+++ b/doc/tex/funcs.tex
@@ -10,8 +10,7 @@ in ``gnutls/gnutls.h''.
 \section{\gnutls{} X.509 certificate handling\index{Function reference!for X.509 certificates}}
 \label{sec:x509api}
 The following functions are to be used for X.509 certificate handling.
-Their prototypes lie in ``gnutls/x509.h''. Most of the functions defined
-here require linking against the library called ``gnutls-x509''.
+Their prototypes lie in ``gnutls/x509.h''.
 
 \input{x509-api}
 

diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index 3f38169d0607ad1b0bd942f7f94d7faefd2236b6..bafdd7521f11b90c9fa2dc6b22785c9c934b96e2 100644 (file)
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -1,7 +1,7 @@
 /*
  *  Copyright (C) 2001,2002,2003 Nikos Mavroyanopoulos
  *
- * This file is part of GNUTLS.
+ *  This file is part of GNUTLS.
  *
  *  The GNUTLS library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public   

diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index f8b48492e9f8578107c4de4405d0f3118a47a543..453bad8cf4c7fa48f9150a6c2c01b328c738a5ef 100644 (file)
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -4,7 +4,7 @@ EXTRA_DIST = dn.h common.h x509.h extensions.h pkcs7.h \
        privkey.h
 
 noinst_LTLIBRARIES = libx509.la
-lib_LTLIBRARIES = libgnutls-x509.la
+#lib_LTLIBRARIES = libgnutls-x509.la
 
 COBJECTS1 = crl.c dn.c common.c x509.c extensions.c \
        rfc2818_hostname.c verify.c mpi.c privkey.c pkcs7.c
@@ -15,12 +15,12 @@ COBJECTS2 = crq.c xml.c sign.c pkcs5.c privkey_pkcs8.c
 COMPAT_OBJECTS = compat.c
 
 
-libx509_la_SOURCES = $(COBJECTS1) $(COMPAT_OBJECTS)
+libx509_la_SOURCES = $(COBJECTS1) $(COMPAT_OBJECTS) $(COBJECTS2)
 
-libgnutls_x509_la_SOURCES = $(COBJECTS2)
+#libgnutls_x509_la_SOURCES = $(COBJECTS2)
 
-libgnutls_x509_la_LIBADD = ../libgnutls.la
-libgnutls_x509_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+#libgnutls_x509_la_LIBADD = ../libgnutls.la
+#libgnutls_x509_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 x509-api.tex: $(COBJECTS1) $(COBJECTS2)
        @echo "" > x509-api.tex