removed gnutls_const_datum type.

diff --git a/doc/tex/ex-pkcs12.tex b/doc/tex/ex-pkcs12.tex
index 137f4d98c7d87e278b44f5da4548bc3ba3ad0cd3..71fba2fa24f4907f22ecca217e4f123ef720f81d 100644 (file)
--- a/doc/tex/ex-pkcs12.tex
+++ b/doc/tex/ex-pkcs12.tex
@@ -29,7 +29,6 @@ int write_pkcs12(const gnutls_datum * cert, const gnutls_datum * pkcs8_key,
    gnutls_datum key_id = { "\x00\x00\x07", 3 };
 
    gnutls_global_init();
-   gnutls_global_set_log_level(2);
 
    /* Firstly we create two helper bags, which hold the certificate,
     * and the (encrypted) key.
@@ -58,7 +57,9 @@ int write_pkcs12(const gnutls_datum * cert, const gnutls_datum * pkcs8_key,
     */
    gnutls_pkcs12_bag_set_key_id(bag, bag_index, &key_id);
 
-   gnutls_pkcs12_bag_encrypt(bag, password, 0);
+   /* use weak encryption for the certificate. 
+    */
+   gnutls_pkcs12_bag_encrypt(bag, password, GNUTLS_PKCS_USE_PKCS12_RC2_40);
 
    /* Now the key.
     */
@@ -71,8 +72,8 @@ int write_pkcs12(const gnutls_datum * cert, const gnutls_datum * pkcs8_key,
       exit(1);
    }
 
-   /* Note that since the PKCS #8 key is encrypted we don't
-    * bother encrypting the bag.
+   /* Note that since the PKCS #8 key is already encrypted we don't
+    * bother encrypting that bag.
     */
    bag_index = ret;
 

diff --git a/doc/tex/examples.tex b/doc/tex/examples.tex
index 5b642a1357be818db06c655c8e03c0141d0196f6..863fa7fd248426c68e033adf8255da2543c5c830 100644 (file)
--- a/doc/tex/examples.tex
+++ b/doc/tex/examples.tex
@@ -107,13 +107,14 @@ The following example is about generating a certificate request, and
 a private key. A certificate request can be later be processed by a CA,
 which should return a signed certificate.
 
+\input{ex-crq}
+
 \subsection{PKCS \#12 structure generation}
 \label{ex:pkcs12}
 The following example is about generating a PKCS \#12 structure.
 
 \input{ex-pkcs12}
 
-\input{ex-crq}
 
 
 \input{openssl}

diff --git a/includes/gnutls/pkcs12.h b/includes/gnutls/pkcs12.h
index 59d8bb3b928277cc2b75ae76da500c72a72d44b4..0a2503236d50161fcd212962d5096e8d09e90d7f 100644 (file)
--- a/includes/gnutls/pkcs12.h
+++ b/includes/gnutls/pkcs12.h
@@ -65,7 +65,7 @@ typedef enum gnutls_pkcs12_bag_type {
 } gnutls_pkcs12_bag_type;
 
 gnutls_pkcs12_bag_type gnutls_pkcs12_bag_get_type(gnutls_pkcs12_bag bag, int indx);
-int gnutls_pkcs12_bag_get_data(gnutls_pkcs12_bag bag, int indx, gnutls_const_datum* data);
+int gnutls_pkcs12_bag_get_data(gnutls_pkcs12_bag bag, int indx, gnutls_datum* data);
 int gnutls_pkcs12_bag_set_data(gnutls_pkcs12_bag bag, gnutls_pkcs12_bag_type type,
         const gnutls_datum* data);
 int gnutls_pkcs12_bag_set_crl(gnutls_pkcs12_bag bag, gnutls_x509_crl crl);

diff --git a/lib/gnutls.h.in.in b/lib/gnutls.h.in.in
index a961f262bd2bc3bfc7854b0bc01ae50fd0ca9609..07be18d25f38964e51c8f0e4e193fb48e285c01d 100644 (file)
--- a/lib/gnutls.h.in.in
+++ b/lib/gnutls.h.in.in
@@ -193,11 +193,6 @@ typedef struct {
 } 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 40743a02b958ab066d4b6c957a9d1403237cd3b8..47aecbfb79ade8f2ccf54c502f340a4c69c4d1f7 100644 (file)
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -146,11 +146,6 @@ typedef struct {
        unsigned int size;
 } gnutls_datum;
 
-typedef struct {
-       const opaque * data;
-       unsigned int size;
-} gnutls_const_datum;
-
 #include <gnutls_buffer.h>
 
 /* This is the maximum number of algorithms (ciphers or macs etc).

diff --git a/lib/x509/pkcs12_bag.c b/lib/x509/pkcs12_bag.c
index 466f4e7970c11422649f84ed5e1f47a0ad9ce94a..622b225964caae2f957c2150a70cf8924f6032db 100644 (file)
--- a/lib/x509/pkcs12_bag.c
+++ b/lib/x509/pkcs12_bag.c
@@ -134,7 +134,7 @@ int gnutls_pkcs12_bag_get_count(gnutls_pkcs12_bag bag)
   * This function will return the bag's data. 
   *
   **/
-int gnutls_pkcs12_bag_get_data(gnutls_pkcs12_bag bag, int indx, gnutls_const_datum * data)
+int gnutls_pkcs12_bag_get_data(gnutls_pkcs12_bag bag, int indx, gnutls_datum * data)
 {
        if (bag == NULL) {
                gnutls_assert();

diff --git a/src/certtool.c b/src/certtool.c
index 98fe2aa0c512d4d6a547006c9b7fa2660c2f613f..62fd598ac80a2be70e743413ea289fdccea9aa1c 100644 (file)
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -2228,9 +2228,9 @@ void print_bag_data(gnutls_pkcs12_bag bag)
 {
 int result;
 int count, i, type;
-gnutls_const_datum cdata;
+gnutls_datum cdata;
 const char* str;
-gnutls_datum out, data;
+gnutls_datum out;
 
        count = gnutls_pkcs12_bag_get_count( bag);
        if (count < 0) {
@@ -2274,14 +2274,8 @@ gnutls_datum out, data;
                        str = NULL;
                }               
        
-               /* we have to cast gnutls_const_datum to a
-                * plain datum.
-                */
-               data.data = (unsigned char*)cdata.data;
-               data.size = cdata.size;
-
                if (str != NULL) {
-                       gnutls_pem_base64_encode_alloc( str, &data, &out);
+                       gnutls_pem_base64_encode_alloc( str, &cdata, &out);
                        fprintf( outfile, "%s\n", out.data);
                
                        gnutls_free(out.data);