diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-08-04 13:15:28 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-08-04 13:18:45 +0200 |
| commit | e7e14d850e418ad129769ebd908aa90caaff1a2a (patch) | |
| tree | 8c1422b0b1ba6334eda4294bc14b7f625b50563a | |
| parent | f149bd2aecaabc1723693f6aa60097bd5f9b63d6 (diff) | |
| download | gnutls-e7e14d850e418ad129769ebd908aa90caaff1a2a.tar.gz | |
corrected example and added missing files.
| -rw-r--r-- | doc/examples/ex-cert-select.c | 2 | ||||
| -rw-r--r-- | doc/invoke-certtool.texi | 9 | ||||
| -rw-r--r-- | tests/pkcs12-decode/Makefile.am | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/doc/examples/ex-cert-select.c b/doc/examples/ex-cert-select.c index 49dfd8d643..7b5173425a 100644 --- 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 34d618f255..4bc812c690 100644 --- 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 e7fabcd262..a702adfa8a 100644 --- 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 |