diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-01-23 20:58:28 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-01-23 20:58:28 +0100 |
| commit | a0c6659d49ead8e65a28d8d421b96546025d0cd9 (patch) | |
| tree | 8387c96cc17c2a688edd972b26ccf26d44239ef6 /src/p11tool.c | |
| parent | af05d80baa2b3222f967a97265840e387e7060c6 (diff) | |
| download | gnutls-a0c6659d49ead8e65a28d8d421b96546025d0cd9.tar.gz | |
updated inder and inraw commands.
Diffstat (limited to 'src/p11tool.c')
| -rw-r--r-- | src/p11tool.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/p11tool.c b/src/p11tool.c index beeaa5ab93..a4e4913760 100644 --- a/src/p11tool.c +++ b/src/p11tool.c @@ -142,8 +142,10 @@ cmd_parser (int argc, char **argv) if (HAVE_OPT(PKCS8)) cinfo.pkcs8 = 1; - if (HAVE_OPT(INDER) || HAVE_OPT(INRAW)) + if (ENABLED_OPT(INDER) || ENABLED_OPT(INRAW)) cinfo.incert_format = GNUTLS_X509_FMT_DER; + else + cinfo.incert_format = GNUTLS_X509_FMT_PEM; if (HAVE_OPT(LOAD_CERTIFICATE)) cinfo.cert = OPT_ARG(LOAD_CERTIFICATE); |