corrected example and added missing files.

diff --git a/doc/examples/ex-cert-select.c b/doc/examples/ex-cert-select.c
index 49dfd8d643b70f02507ec9f4a1ee7c55e0b84810..7b5173425ad283421780e140b8ffc92beb5d1895 100644 (file)
--- a/doc/examples/ex-cert-select.c
+++ b/doc/examples/ex-cert-select.c
@@ -75,7 +75,7 @@ load_keys (void)
 
   gnutls_privkey_init (&key);
 
-  ret = gnutls_privkey_import_x509_raw (key, &data, GNUTLS_X509_FMT_PEM, NULL);
+  ret = gnutls_privkey_import_x509_raw (key, &data, GNUTLS_X509_FMT_PEM, NULL, 0);
   if (ret < 0)
     {
       fprintf (stderr, "*** Error loading key file: %s\n",

diff --git a/doc/invoke-certtool.texi b/doc/invoke-certtool.texi
index 34d618f255857f833896b25a1b58b84ed8099f78..4bc812c6903623be61c882682ecd4d491ed2dd9a 100644 (file)
--- a/doc/invoke-certtool.texi
+++ b/doc/invoke-certtool.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (invoke-certtool.texi)
 # 
-# It has been AutoGen-ed  June 28, 2012 at 09:25:29 PM by AutoGen 5.16
+# It has been AutoGen-ed  August  4, 2012 at 01:15:27 PM by AutoGen 5.16
 # From the definitions    ../src/certtool-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -70,6 +70,7 @@ USAGE:  certtool [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
        --load-ca-privkey=str  Loads the certificate authority's private key file
        --load-ca-certificate=str Loads the certificate authority's certificate file
        --password=str         Password to use
+       --null-password        Enforce a NULL password
    -i, --certificate-info     Print information on the given certificate
        --certificate-pubkey   Print certificate's public key
        --pgp-certificate-info  Print information on the given OpenPGP certificate
@@ -207,6 +208,12 @@ This can be either a file or a PKCS #11 URL
 This is the ``loads the certificate authority's certificate file'' option.
 This option takes an argument string.
 This can be either a file or a PKCS #11 URL
+@anchor{certtool null-password}
+@subheading null-password option
+@cindex certtool-null-password
+
+This is the ``enforce a null password'' option.
+This option enforces a NULL password. This may be different than the empty password in some schemas.
 @anchor{certtool to-p12}
 @subheading to-p12 option
 @cindex certtool-to-p12

diff --git a/tests/pkcs12-decode/Makefile.am b/tests/pkcs12-decode/Makefile.am
index e7fabcd262807a9c09c19964ea13fd04b8d56e8b..a702adfa8a058cbc749ce022076a3d2d29faef96 100644 (file)
--- a/tests/pkcs12-decode/Makefile.am
+++ b/tests/pkcs12-decode/Makefile.am
@@ -20,7 +20,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 EXTRA_DIST = client.p12 noclient.p12 unclient.p12 pkcs12_2certs.p12 \
-       pkcs12_5certs.p12
+       pkcs12_5certs.p12 test-null.p12
 
 dist_check_SCRIPTS = pkcs12