implement and use new macros BN_get_sign(), BN_set_sign()

[openssl.git] / apps / rsautl.c

diff --git a/apps/rsautl.c b/apps/rsautl.c
index e4bc219063a7942a3b54454d75f0174387b734ef..36957e5b8420334a355222d94e41d0995abda285 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;
@@ -120,7 +123,7 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) badarg = 1;
                        keyfile = *(++argv);
                } else if (strcmp(*argv,"-keyform") == 0) {
-                       if (--argc < 1) goto bad;
+                       if (--argc < 1) badarg = 1;
                        keyform=str2fmt(*(++argv));
                } else if(!strcmp(*argv, "-engine")) {
                        if (--argc < 1) badarg = 1;
@@ -166,12 +169,12 @@ int MAIN(int argc, char **argv)
        
        switch(key_type) {
                case KEY_PRIVKEY:
-               pkey = load_key(bio_err, keyfile, keyform,
+               pkey = load_key(bio_err, keyfile, keyform, 0,
                        NULL, e, "Private Key");
                break;
 
                case KEY_PUBKEY:
-               pkey = load_pubkey(bio_err, keyfile, keyform,
+               pkey = load_pubkey(bio_err, keyfile, keyform, 0,
                        NULL, e, "Public Key");
                break;