From dd4a63b4f51afdbc9dac8868142976d91ebd1c7d Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 24 May 2007 11:41:08 +0000
Subject: Export gnutls_x509_crt_get_raw_dn, gnutls_x509_crt_get_raw_issuer_dn.

---
 lib/x509/verify.c |  8 ++++----
 lib/x509/x509.c   | 52 ++++++++++++++++++++++++++--------------------------
 lib/x509/x509.h   |  4 ----
 3 files changed, 30 insertions(+), 34 deletions(-)

(limited to 'lib')

diff --git a/lib/x509/verify.c b/lib/x509/verify.c
index 9e6020220b..0ff02f8fb7 100644
--- a/lib/x509/verify.c
+++ b/lib/x509/verify.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation
  *
  * Author: Nikos Mavroyanopoulos
  *
@@ -164,14 +164,14 @@ is_issuer (gnutls_x509_crt_t cert, gnutls_x509_crt_t issuer_cert)
   NULL, 0};
   int ret;
 
-  ret = _gnutls_x509_crt_get_raw_issuer_dn (cert, &dn1);
+  ret = gnutls_x509_crt_get_raw_issuer_dn (cert, &dn1);
   if (ret < 0)
     {
       gnutls_assert ();
       goto cleanup;
     }
 
-  ret = _gnutls_x509_crt_get_raw_dn (issuer_cert, &dn2);
+  ret = gnutls_x509_crt_get_raw_dn (issuer_cert, &dn2);
   if (ret < 0)
     {
       gnutls_assert ();
@@ -899,7 +899,7 @@ is_crl_issuer (gnutls_x509_crl_t crl, gnutls_x509_crt_t issuer_cert)
       goto cleanup;
     }
 
-  ret = _gnutls_x509_crt_get_raw_dn (issuer_cert, &dn2);
+  ret = gnutls_x509_crt_get_raw_dn (issuer_cert, &dn2);
   if (ret < 0)
     {
       gnutls_assert ();
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 956dbfb8e3..8de03ef51b 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -1682,37 +1682,37 @@ cleanup:
   return result;
 }
 
-/*-
-  * _gnutls_x509_crt_get_raw_issuer_dn - This function returns the issuer's DN DER encoded
-  * @cert: should contain a gnutls_x509_crt_t structure
-  * @start: will hold the starting point of the DN
-  *
-  * This function will return a pointer to the DER encoded DN structure and
-  * the length.
-  *
-  * Returns 0 on success or a negative value on error.
-  *
-  -*/
+/**
+ * gnutls_x509_crt_get_raw_issuer_dn - This function returns the issuer's DN DER encoded
+ * @cert: should contain a gnutls_x509_crt_t structure
+ * @start: will hold the starting point of the DN
+ *
+ * This function will return a pointer to the DER encoded DN structure
+ * and the length.
+ *
+ * Returns 0 on success or a negative value on error.
+ *
+ **/
 int
-_gnutls_x509_crt_get_raw_issuer_dn (gnutls_x509_crt_t cert,
-				    gnutls_datum_t * start)
+gnutls_x509_crt_get_raw_issuer_dn (gnutls_x509_crt_t cert,
+				   gnutls_datum_t * start)
 {
   return _gnutls_x509_crt_get_raw_dn2 (cert, "issuer", start);
 }
 
-/*-
-  * _gnutls_x509_crt_get_raw_dn - This function returns the subject's DN DER encoded
-  * @cert: should contain a gnutls_x509_crt_t structure
-  * @start: will hold the starting point of the DN
-  *
-  * This function will return a pointer to the DER encoded DN structure and
-  * the length.
-  *
-  * Returns 0 on success, or a negative value on error.
-  *
-  -*/
+/**
+ * gnutls_x509_crt_get_raw_dn - This function returns the subject's DN DER encoded
+ * @cert: should contain a gnutls_x509_crt_t structure
+ * @start: will hold the starting point of the DN
+ *
+ * This function will return a pointer to the DER encoded DN structure and
+ * the length.
+ *
+ * Returns 0 on success, or a negative value on error.
+ *
+ **/
 int
-_gnutls_x509_crt_get_raw_dn (gnutls_x509_crt_t cert, gnutls_datum_t * start)
+gnutls_x509_crt_get_raw_dn (gnutls_x509_crt_t cert, gnutls_datum_t * start)
 {
   return _gnutls_x509_crt_get_raw_dn2 (cert, "subject", start);
 }
@@ -2158,7 +2158,7 @@ gnutls_x509_crt_check_revocation (gnutls_x509_crt_t cert,
 	  return ret;
 	}
 
-      ret = _gnutls_x509_crt_get_raw_issuer_dn (cert, &dn2);
+      ret = gnutls_x509_crt_get_raw_issuer_dn (cert, &dn2);
       if (ret < 0)
 	{
 	  gnutls_assert ();
diff --git a/lib/x509/x509.h b/lib/x509/x509.h
index 50dde03ae8..f6aac87dda 100644
--- a/lib/x509/x509.h
+++ b/lib/x509/x509.h
@@ -111,10 +111,6 @@ int gnutls_x509_crt_get_pk_algorithm (gnutls_x509_crt_t cert,
 				      unsigned int *bits);
 
 int _gnutls_x509_crt_cpy (gnutls_x509_crt_t dest, gnutls_x509_crt_t src);
-int _gnutls_x509_crt_get_raw_issuer_dn (gnutls_x509_crt_t cert,
-					gnutls_datum_t * start);
-int _gnutls_x509_crt_get_raw_dn (gnutls_x509_crt_t cert,
-				 gnutls_datum_t * start);
 
 int gnutls_x509_crt_get_serial (gnutls_x509_crt_t cert, void *result,
 				size_t * result_size);
-- 
cgit v1.2.1