Implement known-IV countermeasure.

[openssl.git] / apps / rsautl.c

diff --git a/apps/rsautl.c b/apps/rsautl.c
index c04a2fcb9b861614fde98157f9ded560d9f8581c..9b02e6782e01bc657fad82d95f8be43381ab60a9 100644 (file)
--- a/apps/rsautl.c
+++ b/apps/rsautl.c
@@ -104,6 +104,9 @@ int MAIN(int argc, char **argv)
        argv++;
 
        if(!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
+
+       if (!load_config(bio_err, NULL))
+               goto end;
        ERR_load_crypto_strings();
        OpenSSL_add_all_algorithms();
        pad = RSA_PKCS1_PADDING;
@@ -119,6 +122,9 @@ int MAIN(int argc, char **argv)
                } else if(!strcmp(*argv, "-inkey")) {
                        if (--argc < 1) badarg = 1;
                        keyfile = *(++argv);
+               } else if (strcmp(*argv,"-keyform") == 0) {
+                       if (--argc < 1) badarg = 1;
+                       keyform=str2fmt(*(++argv));
                } else if(!strcmp(*argv, "-engine")) {
                        if (--argc < 1) badarg = 1;
                        engine = *(++argv);
@@ -287,6 +293,7 @@ static void usage()
        BIO_printf(bio_err, "-in file        input file\n");
        BIO_printf(bio_err, "-out file       output file\n");
        BIO_printf(bio_err, "-inkey file     input key\n");
+       BIO_printf(bio_err, "-keyform arg    private key format - default PEM\n");
        BIO_printf(bio_err, "-pubin          input is an RSA public\n");
        BIO_printf(bio_err, "-certin         input is a certificate carrying an RSA public key\n");
        BIO_printf(bio_err, "-ssl            use SSL v2 padding\n");
@@ -298,6 +305,8 @@ static void usage()
        BIO_printf(bio_err, "-encrypt        encrypt with public key\n");
        BIO_printf(bio_err, "-decrypt        decrypt with private key\n");
        BIO_printf(bio_err, "-hexdump        hex dump output\n");
+       BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
+
 }
 
 #endif