Move dn.h stuff to x509_int.h.

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index cc2fe3e14bd0e059d99d8b9ef2c915ff5b2ea11f..f7a125c0971474dfb39f6f8f7cde1e3b13eadf5e 100644 (file)
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -69,7 +69,7 @@ IGNORE_HFILES=debug.h gnutls_compress.h defines.h gnutls_cipher.h     \
        errors_int.h int.h mem.h structure.h                            \
                                                                        \
        common.h dsa.h mpi.h pkcs7.h rfc2818.h verify.h compat.h        \
-       dn.h extensions.h privkey.h                                     \
+       extensions.h privkey.h                                          \
                                                                        \
        gnutls_extra.h openssl_compat.h                                 \
                                                                        \

diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index ab6cb5b5eb126f16bf1bd8ce9cc89acb09180356..7ccc1e62fb4eca94c262dadd6d8dbd72632d104d 100644 (file)
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -31,9 +31,9 @@ noinst_LTLIBRARIES = libgnutls_x509.la
 libgnutls_x509_la_SOURCES = crl.c dn.c common.c x509.c extensions.c    \
        dsa.c rfc2818_hostname.c verify.c mpi.c privkey.c pkcs7.c       \
        crq.c sign.c privkey_pkcs8.c pkcs12.c pkcs12_bag.c              \
-       pkcs12_encr.c x509_write.c crl_write.c dn.h common.h            \
-       x509_int.h extensions.h pkcs7.h verify.h mpi.h privkey.h        \
-       pkcs12.h rfc2818.h dsa.h output.c
+       pkcs12_encr.c x509_write.c crl_write.c common.h x509_int.h      \
+       extensions.h pkcs7.h verify.h mpi.h privkey.h pkcs12.h          \
+       rfc2818.h dsa.h output.c
 
 EXTRA_DIST = x509-api.texi
 

diff --git a/lib/x509/crl.c b/lib/x509/crl.c
index 6e7536d65131ac15fa7b67dd0d7e8dd34e371b8c..4beea257adc100691f4116696485fc24d5c06ce5 100644 (file)
--- a/lib/x509/crl.c
+++ b/lib/x509/crl.c
@@ -33,7 +33,6 @@
 #include <common.h>
 #include <x509_b64.h>
 #include <x509_int.h>
-#include <dn.h>
 
 /**
   * gnutls_x509_crl_init - This function initializes a gnutls_x509_crl_t structure

diff --git a/lib/x509/crl_write.c b/lib/x509/crl_write.c
index be74c8e8ffd05be02b6c60625ba42c54d7eda3a3..6b9cd2cdc5d8c9252908b88b75714c73ffef153d 100644 (file)
--- a/lib/x509/crl_write.c
+++ b/lib/x509/crl_write.c
@@ -36,7 +36,6 @@
 #include <gnutls_x509.h>
 #include <x509_b64.h>
 #include <x509_int.h>
-#include <dn.h>
 #include <mpi.h>
 #include <extensions.h>
 #include <libtasn1.h>

diff --git a/lib/x509/crq.c b/lib/x509/crq.c
index 0c4cf4dc1f885e4536170f3f24c2c8d68afcbc6b..ac74c8a7c2d6896a3a06d045c534446cc6a5ff8e 100644 (file)
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -36,7 +36,6 @@
 #include <gnutls_x509.h>
 #include <x509_b64.h>
 #include <x509_int.h>
-#include <dn.h>
 #include <mpi.h>
 #include <extensions.h>
 #include <libtasn1.h>

diff --git a/lib/x509/dn.c b/lib/x509/dn.c
index 9c94cd5f3f5bef27f0b5c2613967d9a4a804ed16..129227a722b828eb1e7db03f2c099e5db118d493 100644 (file)
--- a/lib/x509/dn.c
+++ b/lib/x509/dn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2007  Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008  Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -30,7 +30,6 @@
 #include <gnutls_str.h>
 #include <common.h>
 #include <gnutls_num.h>
-#include <dn.h>
 
 /* This file includes all the required to parse an X.509 Distriguished
  * Name (you need a parser just to read a name in the X.509 protoocols!!!)

diff --git a/lib/x509/dn.h b/lib/x509/dn.h
deleted file mode 100644 (file)
index 93a9262..0000000
--- a/lib/x509/dn.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2003, 2004, 2005 Free Software Foundation
- *
- * Author: Nikos Mavrogiannopoulos
- *
- * 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 License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA
- *
- */
-
-#ifndef DN_H
-# define DN_H
-
-/* Some OIDs usually found in Distinguished names
- */
-#define OID_X520_COUNTRY_NAME          "2.5.4.6"
-#define OID_X520_ORGANIZATION_NAME     "2.5.4.10"
-#define OID_X520_ORGANIZATIONAL_UNIT_NAME "2.5.4.11"
-#define OID_X520_COMMON_NAME           "2.5.4.3"
-#define OID_X520_LOCALITY_NAME                 "2.5.4.7"
-#define OID_X520_STATE_OR_PROVINCE_NAME        "2.5.4.8"
-#define OID_LDAP_DC                    "0.9.2342.19200300.100.1.25"
-#define OID_LDAP_UID                   "0.9.2342.19200300.100.1.1"
-#define OID_PKCS9_EMAIL                        "1.2.840.113549.1.9.1"
-
-int _gnutls_x509_parse_dn (ASN1_TYPE asn1_struct,
-                          const char *asn1_rdn_name, char *buf,
-                          size_t * sizeof_buf);
-
-int _gnutls_x509_parse_dn_oid (ASN1_TYPE asn1_struct,
-                              const char *asn1_rdn_name, const char *oid,
-                              int indx, unsigned int raw_flag, void *buf,
-                              size_t * sizeof_buf);
-
-int _gnutls_x509_set_dn_oid (ASN1_TYPE asn1_struct,
-                            const char *asn1_rdn_name, const char *oid,
-                            int raw_flag, const char *name, int sizeof_name);
-
-int _gnutls_x509_get_dn_oid (ASN1_TYPE asn1_struct,
-                            const char *asn1_rdn_name,
-                            int indx, void *_oid, size_t * sizeof_oid);
-
-
-#endif

diff --git a/lib/x509/pkcs12.c b/lib/x509/pkcs12.c
index d43e8d560b6e6dfb83881500de4f7131e3e44e37..b258373108be933b59aaa509c0794f36d9682296 100644 (file)
--- a/lib/x509/pkcs12.c
+++ b/lib/x509/pkcs12.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -37,7 +37,6 @@
 #include <common.h>
 #include <x509_b64.h>
 #include <pkcs12.h>
-#include <dn.h>
 #include <mpi.h>
 #include <gc.h>
 

diff --git a/lib/x509/pkcs7.c b/lib/x509/pkcs7.c
index 5f6c8fd135937c76ba226dd6b319ef7f17c5e152..f24bc0966ed3f9470333e35e60339fa2d03fa92d 100644 (file)
--- a/lib/x509/pkcs7.c
+++ b/lib/x509/pkcs7.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -36,7 +36,6 @@
 #include <common.h>
 #include <x509_b64.h>
 #include <pkcs7.h>
-#include <dn.h>
 
 #define SIGNED_DATA_OID "1.2.840.113549.1.7.2"
 

diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index 0f710017e2c591a881dd543996691d34273d1c11..ce27edd21275e74d4c372a5b209da0ca63840716 100644 (file)
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -32,7 +32,6 @@
 #include <gnutls_x509.h>
 #include <x509_b64.h>
 #include <x509_int.h>
-#include <dn.h>
 #include <mpi.h>
 #include <extensions.h>
 #include <dsa.h>

diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index 350fb5e272bdf8a4408edba6dbf91eee17203329..caf61ab3fd39207ac96b7f7869ff7f610f55133c 100644 (file)
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -34,7 +34,6 @@
 #include <gnutls_x509.h>
 #include <x509_b64.h>
 #include <x509_int.h>
-#include <dn.h>
 #include <pkcs12.h>
 #include <privkey.h>
 #include <extensions.h>

diff --git a/lib/x509/rfc2818_hostname.c b/lib/x509/rfc2818_hostname.c
index f2fd3acad8a7c1dc450c9b40c9af494515ffb5a3..9742f4153f00a77885a96db58346c39c448a5437 100644 (file)
--- a/lib/x509/rfc2818_hostname.c
+++ b/lib/x509/rfc2818_hostname.c
@@ -23,7 +23,6 @@
 
 #include <gnutls_int.h>
 #include <x509_int.h>
-#include <dn.h>
 #include <common.h>
 #include <rfc2818.h>
 #include <gnutls_errors.h>

diff --git a/lib/x509/sign.c b/lib/x509/sign.c
index e60b92ae62e4041d598e6d1e3ae6dcb6965318fa..36a0f03ac29a279cb56cfa8ba07eb5ff7f311ec5 100644 (file)
--- a/lib/x509/sign.c
+++ b/lib/x509/sign.c
@@ -38,7 +38,6 @@
 #include <gnutls_sig.h>
 #include <gnutls_str.h>
 #include <gnutls_datum.h>
-#include <dn.h>
 #include <x509_int.h>
 #include <mpi.h>
 #include <common.h>

diff --git a/lib/x509/verify.c b/lib/x509/verify.c
index e0a586a50153a9ee053d7102c7661594ad3660b2..052b9a4dbc139020160338c24ae072b7b6fd5e02 100644 (file)
--- a/lib/x509/verify.c
+++ b/lib/x509/verify.c
@@ -35,7 +35,6 @@
 #include <gnutls_sig.h>
 #include <gnutls_str.h>
 #include <gnutls_datum.h>
-#include <dn.h>
 #include <x509_int.h>
 #include <mpi.h>
 #include <common.h>

diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 0d2214eb9d5492f0d9d248ba6637ef12b424f464..e591b00c88d7b7abec81c3e079151fa0ecd506f0 100644 (file)
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -32,7 +32,6 @@
 #include <gnutls_x509.h>
 #include <x509_b64.h>
 #include <x509_int.h>
-#include <dn.h>
 #include <extensions.h>
 #include <libtasn1.h>
 #include <mpi.h>

diff --git a/lib/x509/x509_int.h b/lib/x509/x509_int.h
index ed88426f728a6d08720091afef97c5a9f614f190..3ff438cc2cc976fed9cc4636fce5949e6196aa4d 100644 (file)
--- a/lib/x509/x509_int.h
+++ b/lib/x509/x509_int.h
@@ -127,4 +127,32 @@ int _gnutls_x509_pkix_sign (ASN1_TYPE src, const char *src_name,
                            gnutls_x509_crt_t issuer,
                            gnutls_x509_privkey_t issuer_key);
 
+/* dn.c */
+#define OID_X520_COUNTRY_NAME          "2.5.4.6"
+#define OID_X520_ORGANIZATION_NAME     "2.5.4.10"
+#define OID_X520_ORGANIZATIONAL_UNIT_NAME "2.5.4.11"
+#define OID_X520_COMMON_NAME           "2.5.4.3"
+#define OID_X520_LOCALITY_NAME                 "2.5.4.7"
+#define OID_X520_STATE_OR_PROVINCE_NAME        "2.5.4.8"
+#define OID_LDAP_DC                    "0.9.2342.19200300.100.1.25"
+#define OID_LDAP_UID                   "0.9.2342.19200300.100.1.1"
+#define OID_PKCS9_EMAIL                        "1.2.840.113549.1.9.1"
+
+int _gnutls_x509_parse_dn (ASN1_TYPE asn1_struct,
+                          const char *asn1_rdn_name, char *buf,
+                          size_t * sizeof_buf);
+
+int _gnutls_x509_parse_dn_oid (ASN1_TYPE asn1_struct,
+                              const char *asn1_rdn_name, const char *oid,
+                              int indx, unsigned int raw_flag, void *buf,
+                              size_t * sizeof_buf);
+
+int _gnutls_x509_set_dn_oid (ASN1_TYPE asn1_struct,
+                            const char *asn1_rdn_name, const char *oid,
+                            int raw_flag, const char *name, int sizeof_name);
+
+int _gnutls_x509_get_dn_oid (ASN1_TYPE asn1_struct,
+                            const char *asn1_rdn_name,
+                            int indx, void *_oid, size_t * sizeof_oid);
+
 #endif

diff --git a/lib/x509/x509_write.c b/lib/x509/x509_write.c
index 90e1b054ef2bd2b22fa6cda5b66be6d7d2b2c2a8..2b9feab8bdb32749086d5eb0a4244de6f83cf13d 100644 (file)
--- a/lib/x509/x509_write.c
+++ b/lib/x509/x509_write.c
@@ -36,7 +36,6 @@
 #include <gnutls_x509.h>
 #include <x509_b64.h>
 #include <x509_int.h>
-#include <dn.h>
 #include <mpi.h>
 #include <extensions.h>
 #include <libtasn1.h>

diff --git a/libextra/openssl_compat.c b/libextra/openssl_compat.c
index b19864609e2fb2cde106ec38f787713742b3a8f2..089cb5a567598fce861cdfb0d4a8f07e743ab7a1 100644 (file)
--- a/libextra/openssl_compat.c
+++ b/libextra/openssl_compat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -29,7 +29,7 @@
 #include <gnutls_global.h>
 #include <gnutls_errors.h>
 #include <string.h>            /* memset */
-#include <x509/dn.h>
+#include <x509/x509_int.h>
 #include <libtasn1.h>
 #include <gnutls/x509.h>
 #include <openssl_compat.h>