poly1305/poly1305.c: work around -Wshadow warnings with POLY1305_ASM.

[openssl.git] / apps / x509.c

diff --git a/apps/x509.c b/apps/x509.c
index 5d6bb9679ac35199ab237f63762817e3714fc2d8..831d59db448b416a333fcff9e75e9a31a8214032 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -160,7 +160,7 @@ OPTIONS x509_options[] = {
      "Output a certification request object"},
     {"req", OPT_REQ, '-', "Input is a certificate request, sign and output"},
     {"CA", OPT_CA, '<', "Set the CA certificate, must be PEM format"},
-    {"CAkey", OPT_CAKEY, '<',
+    {"CAkey", OPT_CAKEY, 's',
      "The CA key, must be PEM format; if not in CAfile"},
     {"CAcreateserial", OPT_CACREATESERIAL, '-',
      "Create serial number file if it does not exist"},
@@ -272,7 +272,7 @@ int x509_main(int argc, char **argv)
                 goto opthelp;
             break;
         case OPT_CAKEYFORM:
-            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &CAkeyformat))
+            if (!opt_format(opt_arg(), OPT_FMT_ANY, &CAkeyformat))
                 goto opthelp;
             break;
         case OPT_OUT: