Deleted Added
sdiff udiff text old ( 109998 ) new ( 111147 )
full compact
rsautl.c (109998) rsautl.c (111147)
1/* rsautl.c */
2/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
3 * project 2000.
4 */
5/* ====================================================================
6 * Copyright (c) 2000 The OpenSSL Project. All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 71 unchanged lines hidden (view full) ---

80
81int MAIN(int argc, char **);
82
83int MAIN(int argc, char **argv)
84{
85 ENGINE *e = NULL;
86 BIO *in = NULL, *out = NULL;
87 char *infile = NULL, *outfile = NULL;
1/* rsautl.c */
2/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
3 * project 2000.
4 */
5/* ====================================================================
6 * Copyright (c) 2000 The OpenSSL Project. All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 71 unchanged lines hidden (view full) ---

80
81int MAIN(int argc, char **);
82
83int MAIN(int argc, char **argv)
84{
85 ENGINE *e = NULL;
86 BIO *in = NULL, *out = NULL;
87 char *infile = NULL, *outfile = NULL;
88#ifndef OPENSSL_NO_ENGINE
88 char *engine = NULL;
89 char *engine = NULL;
90#endif
89 char *keyfile = NULL;
90 char rsa_mode = RSA_VERIFY, key_type = KEY_PRIVKEY;
91 int keyform = FORMAT_PEM;
92 char need_priv = 0, badarg = 0, rev = 0;
93 char hexdump = 0, asn1parse = 0;
94 X509 *x;
95 EVP_PKEY *pkey = NULL;
96 RSA *rsa = NULL;

--- 23 unchanged lines hidden (view full) ---

120 if (--argc < 1) badarg = 1;
121 outfile= *(++argv);
122 } else if(!strcmp(*argv, "-inkey")) {
123 if (--argc < 1) badarg = 1;
124 keyfile = *(++argv);
125 } else if (strcmp(*argv,"-keyform") == 0) {
126 if (--argc < 1) badarg = 1;
127 keyform=str2fmt(*(++argv));
91 char *keyfile = NULL;
92 char rsa_mode = RSA_VERIFY, key_type = KEY_PRIVKEY;
93 int keyform = FORMAT_PEM;
94 char need_priv = 0, badarg = 0, rev = 0;
95 char hexdump = 0, asn1parse = 0;
96 X509 *x;
97 EVP_PKEY *pkey = NULL;
98 RSA *rsa = NULL;

--- 23 unchanged lines hidden (view full) ---

122 if (--argc < 1) badarg = 1;
123 outfile= *(++argv);
124 } else if(!strcmp(*argv, "-inkey")) {
125 if (--argc < 1) badarg = 1;
126 keyfile = *(++argv);
127 } else if (strcmp(*argv,"-keyform") == 0) {
128 if (--argc < 1) badarg = 1;
129 keyform=str2fmt(*(++argv));
130#ifndef OPENSSL_NO_ENGINE
128 } else if(!strcmp(*argv, "-engine")) {
129 if (--argc < 1) badarg = 1;
130 engine = *(++argv);
131 } else if(!strcmp(*argv, "-engine")) {
132 if (--argc < 1) badarg = 1;
133 engine = *(++argv);
134#endif
131 } else if(!strcmp(*argv, "-pubin")) {
132 key_type = KEY_PUBKEY;
133 } else if(!strcmp(*argv, "-certin")) {
134 key_type = KEY_CERT;
135 }
136 else if(!strcmp(*argv, "-asn1parse")) asn1parse = 1;
137 else if(!strcmp(*argv, "-hexdump")) hexdump = 1;
138 else if(!strcmp(*argv, "-raw")) pad = RSA_NO_PADDING;

--- 18 unchanged lines hidden (view full) ---

157 argv++;
158 }
159
160 if(need_priv && (key_type != KEY_PRIVKEY)) {
161 BIO_printf(bio_err, "A private key is needed for this operation\n");
162 goto end;
163 }
164
135 } else if(!strcmp(*argv, "-pubin")) {
136 key_type = KEY_PUBKEY;
137 } else if(!strcmp(*argv, "-certin")) {
138 key_type = KEY_CERT;
139 }
140 else if(!strcmp(*argv, "-asn1parse")) asn1parse = 1;
141 else if(!strcmp(*argv, "-hexdump")) hexdump = 1;
142 else if(!strcmp(*argv, "-raw")) pad = RSA_NO_PADDING;

--- 18 unchanged lines hidden (view full) ---

161 argv++;
162 }
163
164 if(need_priv && (key_type != KEY_PRIVKEY)) {
165 BIO_printf(bio_err, "A private key is needed for this operation\n");
166 goto end;
167 }
168
169#ifndef OPENSSL_NO_ENGINE
165 e = setup_engine(bio_err, engine, 0);
170 e = setup_engine(bio_err, engine, 0);
171#endif
166
167/* FIXME: seed PRNG only if needed */
168 app_RAND_load_file(NULL, bio_err, 0);
169
170 switch(key_type) {
171 case KEY_PRIVKEY:
172 pkey = load_key(bio_err, keyfile, keyform, 0,
173 NULL, e, "Private Key");

--- 126 unchanged lines hidden (view full) ---

300 BIO_printf(bio_err, "-raw use no padding\n");
301 BIO_printf(bio_err, "-pkcs use PKCS#1 v1.5 padding (default)\n");
302 BIO_printf(bio_err, "-oaep use PKCS#1 OAEP\n");
303 BIO_printf(bio_err, "-sign sign with private key\n");
304 BIO_printf(bio_err, "-verify verify with public key\n");
305 BIO_printf(bio_err, "-encrypt encrypt with public key\n");
306 BIO_printf(bio_err, "-decrypt decrypt with private key\n");
307 BIO_printf(bio_err, "-hexdump hex dump output\n");
172
173/* FIXME: seed PRNG only if needed */
174 app_RAND_load_file(NULL, bio_err, 0);
175
176 switch(key_type) {
177 case KEY_PRIVKEY:
178 pkey = load_key(bio_err, keyfile, keyform, 0,
179 NULL, e, "Private Key");

--- 126 unchanged lines hidden (view full) ---

306 BIO_printf(bio_err, "-raw use no padding\n");
307 BIO_printf(bio_err, "-pkcs use PKCS#1 v1.5 padding (default)\n");
308 BIO_printf(bio_err, "-oaep use PKCS#1 OAEP\n");
309 BIO_printf(bio_err, "-sign sign with private key\n");
310 BIO_printf(bio_err, "-verify verify with public key\n");
311 BIO_printf(bio_err, "-encrypt encrypt with public key\n");
312 BIO_printf(bio_err, "-decrypt decrypt with private key\n");
313 BIO_printf(bio_err, "-hexdump hex dump output\n");
314#ifndef OPENSSL_NO_ENGINE
308 BIO_printf(bio_err, "-engine e use engine e, possibly a hardware device.\n");
315 BIO_printf(bio_err, "-engine e use engine e, possibly a hardware device.\n");
316#endif
309
310}
311
312#endif
317
318}
319
320#endif