gnutls_const_datum was removed from exported types, for the time being.

6 files changed, 3 insertions, 90 deletions

diff --git a/includes/gnutls/x509.h b/includes/gnutls/x509.h
index 65e40467ea..f3813fcfc7 100644
--- a/includes/gnutls/x509.h
+++ b/includes/gnutls/x509.h
@@ -62,8 +62,6 @@ int gnutls_x509_crt_get_dn(gnutls_x509_crt cert, char *buf,
 int gnutls_x509_crt_get_dn_by_oid(gnutls_x509_crt cert, 
 	const char* oid, int indx, char *buf, int *sizeof_buf);
 
-int gnutls_x509_crt_get_signed_data(gnutls_x509_crt cert, gnutls_const_datum *data);
-int gnutls_x509_crt_get_signature(gnutls_x509_crt cert, gnutls_const_datum *data);
 int gnutls_x509_crt_get_signature_algorithm(gnutls_x509_crt cert);
 int gnutls_x509_crt_get_version(gnutls_x509_crt cert);
 
@@ -123,10 +121,6 @@ int gnutls_x509_crl_get_issuer_dn(const gnutls_x509_crl crl,
 int gnutls_x509_crl_get_issuer_dn_by_oid(gnutls_x509_crl crl, 
 	const char* oid, int indx, char *buf, int *sizeof_buf);
 
-
-int gnutls_x509_crl_get_signed_data(gnutls_x509_crl crl, gnutls_const_datum *data);
-
-int gnutls_x509_crl_get_signature(gnutls_x509_crl crl, gnutls_const_datum *data);
 int gnutls_x509_crl_get_signature_algorithm(gnutls_x509_crl crl);
 int gnutls_x509_crl_get_version(gnutls_x509_crl crl);
 
diff --git a/lib/gnutls.h.in.in b/lib/gnutls.h.in.in
index 6ec7b25a65..6b6bf74192 100644
--- a/lib/gnutls.h.in.in
+++ b/lib/gnutls.h.in.in
@@ -142,11 +142,6 @@ typedef struct {
 	unsigned int size;
 } gnutls_datum;
 
-typedef struct {
-	const unsigned char * data;
-	unsigned int size;
-} gnutls_const_datum;
-
 /* internal functions */
 
 int gnutls_init(gnutls_session * session, gnutls_connection_end con_end);
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 8f845c71a1..b99d7c8234 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -136,12 +136,12 @@ typedef struct {
 	opaque * data;
 	unsigned int size;
 } gnutls_datum;
-typedef gnutls_datum gnutls_sdatum;
 
 typedef struct {
 	const opaque * data;
 	unsigned int size;
 } gnutls_const_datum;
+typedef gnutls_datum gnutls_sdatum;
 
 #include <gnutls_buffer.h>
 
diff --git a/lib/x509/crl.c b/lib/x509/crl.c
index fc1d33769b..e627a23171 100644
--- a/lib/x509/crl.c
+++ b/lib/x509/crl.c
@@ -282,46 +282,6 @@ int gnutls_x509_crl_get_issuer_dn_by_oid(gnutls_x509_crl crl,
 }
 
 /**
-  * gnutls_x509_crl_get_signed_data - This function returns the CRL's signed portion
-  * @crl: should contain a gnutls_x509_crl structure
-  * @data: a datum which points to the signed data
-  *
-  * This function will return a datum that points on the CRL signed portion.
-  * The output on data should be treated as constant and must not be freed.
-  *
-  * Returns 0 on success.
-  *
-  **/
-int gnutls_x509_crl_get_signed_data(gnutls_x509_crl crl,
-				    gnutls_const_datum * data)
-{
-	data->data = crl->signed_data.data;
-	data->size = crl->signed_data.size;
-
-	return 0;
-}
-
-/**
-  * gnutls_x509_crl_get_signature - This function returns the CRL's signature data
-  * @crl: should contain a gnutls_x509_crl structure
-  * @data: a datum which points to the signed data
-  *
-  * This function will return a datum that points on the CRL signature portion.
-  * The output on data should be treated as constant and must not be freed.
-  *
-  * Returns 0 on success.
-  *
-  **/
-int gnutls_x509_crl_get_signature(gnutls_x509_crl crl,
-				  gnutls_const_datum * data)
-{
-	data->data = crl->signature.data;
-	data->size = crl->signature.size;
-
-	return 0;
-}
-
-/**
   * gnutls_x509_crl_get_signature_algorithm - This function returns the CRL's signature algorithm
   * @crl: should contain a gnutls_x509_crl structure
   *
diff --git a/lib/x509/dn.c b/lib/x509/dn.c
index 72f213d21b..2b252e7d23 100644
--- a/lib/x509/dn.c
+++ b/lib/x509/dn.c
@@ -252,6 +252,8 @@ int _gnutls_x509_parse_dn(ASN1_TYPE asn1_struct,
 								  &sizeof_string))
 				    < 0) {
 					gnutls_assert();
+					_gnutls_log("Found OID: '%s' with value '%s'\n", 
+						oid, _gnutls_bin2hex(value, len, escaped, sizeof(escaped)) );
 					goto cleanup;
 				}
 				STR_APPEND(str_escape
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index c44b2c72e1..373264fc09 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -339,44 +339,6 @@ int gnutls_x509_crt_get_dn_by_oid(gnutls_x509_crt cert, const char* oid,
 }
 
 /**
-  * gnutls_x509_crt_get_signed_data - This function returns the Certificate's signed portion
-  * @cert: should contain a gnutls_x509_crt structure
-  * @data: a datum which points to the signed data
-  *
-  * This function will return a datum that points on the Certificate signed portion.
-  * The output on data should be treated as constant and must not be freed.
-  *
-  * Returns 0 on success.
-  *
-  **/
-int gnutls_x509_crt_get_signed_data(gnutls_x509_crt cert, gnutls_const_datum *data)
-{
-	data->data = cert->signed_data.data;
-	data->size = cert->signed_data.size;
-
-	return 0;
-}
-
-/**
-  * gnutls_x509_crt_get_signature - This function returns the Certificate's signature data
-  * @cert: should contain a gnutls_x509_crt structure
-  * @data: a datum which points to the signed data
-  *
-  * This function will return a datum that points on the Certificate signature portion.
-  * The output on data should be treated as constant and must not be freed.
-  *
-  * Returns 0 on success.
-  *
-  **/
-int gnutls_x509_crt_get_signature(gnutls_x509_crt cert, gnutls_const_datum *data)
-{
-	data->data = cert->signature.data;
-	data->size = cert->signature.size;
-
-	return 0;
-}
-
-/**
   * gnutls_x509_crt_get_signature_algorithm - This function returns the Certificate's signature algorithm
   * @cert: should contain a gnutls_x509_crt structure
   *