Deleted Added
full compact
dgst.c (59191) dgst.c (68651)
1/* apps/dgst.c */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *

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

68#include <openssl/pem.h>
69
70#undef BUFSIZE
71#define BUFSIZE 1024*8
72
73#undef PROG
74#define PROG dgst_main
75
1/* apps/dgst.c */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *

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

68#include <openssl/pem.h>
69
70#undef BUFSIZE
71#define BUFSIZE 1024*8
72
73#undef PROG
74#define PROG dgst_main
75
76void do_fp(unsigned char *buf,BIO *f,int sep);
76void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, char binout,
77 EVP_PKEY *key, unsigned char *sigin, int siglen);
77
78int MAIN(int, char **);
79
80int MAIN(int argc, char **argv)
81 {
82 unsigned char *buf=NULL;
83 int i,err=0;
84 const EVP_MD *md=NULL,*m;
85 BIO *in=NULL,*inp;
86 BIO *bmd=NULL;
78
79int MAIN(int, char **);
80
81int MAIN(int argc, char **argv)
82 {
83 unsigned char *buf=NULL;
84 int i,err=0;
85 const EVP_MD *md=NULL,*m;
86 BIO *in=NULL,*inp;
87 BIO *bmd=NULL;
88 BIO *out = NULL;
87 const char *name;
88#define PROG_NAME_SIZE 16
89 char pname[PROG_NAME_SIZE];
90 int separator=0;
91 int debug=0;
89 const char *name;
90#define PROG_NAME_SIZE 16
91 char pname[PROG_NAME_SIZE];
92 int separator=0;
93 int debug=0;
94 const char *outfile = NULL, *keyfile = NULL;
95 const char *sigfile = NULL, *randfile = NULL;
96 char out_bin = -1, want_pub = 0, do_verify = 0;
97 EVP_PKEY *sigkey = NULL;
98 unsigned char *sigbuf = NULL;
99 int siglen = 0;
92
93 apps_startup();
94
100
101 apps_startup();
102
95 if ((buf=(unsigned char *)Malloc(BUFSIZE)) == NULL)
103 if ((buf=(unsigned char *)OPENSSL_malloc(BUFSIZE)) == NULL)
96 {
97 BIO_printf(bio_err,"out of memory\n");
98 goto end;
99 }
100 if (bio_err == NULL)
101 if ((bio_err=BIO_new(BIO_s_file())) != NULL)
102 BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
103

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

108
109 argc--;
110 argv++;
111 while (argc > 0)
112 {
113 if ((*argv)[0] != '-') break;
114 if (strcmp(*argv,"-c") == 0)
115 separator=1;
104 {
105 BIO_printf(bio_err,"out of memory\n");
106 goto end;
107 }
108 if (bio_err == NULL)
109 if ((bio_err=BIO_new(BIO_s_file())) != NULL)
110 BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
111

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

116
117 argc--;
118 argv++;
119 while (argc > 0)
120 {
121 if ((*argv)[0] != '-') break;
122 if (strcmp(*argv,"-c") == 0)
123 separator=1;
124 else if (strcmp(*argv,"-rand") == 0)
125 {
126 if (--argc < 1) break;
127 randfile=*(++argv);
128 }
129 else if (strcmp(*argv,"-out") == 0)
130 {
131 if (--argc < 1) break;
132 outfile=*(++argv);
133 }
134 else if (strcmp(*argv,"-sign") == 0)
135 {
136 if (--argc < 1) break;
137 keyfile=*(++argv);
138 }
139 else if (strcmp(*argv,"-verify") == 0)
140 {
141 if (--argc < 1) break;
142 keyfile=*(++argv);
143 want_pub = 1;
144 do_verify = 1;
145 }
146 else if (strcmp(*argv,"-prverify") == 0)
147 {
148 if (--argc < 1) break;
149 keyfile=*(++argv);
150 do_verify = 1;
151 }
152 else if (strcmp(*argv,"-signature") == 0)
153 {
154 if (--argc < 1) break;
155 sigfile=*(++argv);
156 }
157 else if (strcmp(*argv,"-hex") == 0)
158 out_bin = 0;
159 else if (strcmp(*argv,"-binary") == 0)
160 out_bin = 1;
116 else if (strcmp(*argv,"-d") == 0)
117 debug=1;
118 else if ((m=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
119 md=m;
120 else
121 break;
122 argc--;
123 argv++;
124 }
125
126 if (md == NULL)
127 md=EVP_md5();
128
161 else if (strcmp(*argv,"-d") == 0)
162 debug=1;
163 else if ((m=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
164 md=m;
165 else
166 break;
167 argc--;
168 argv++;
169 }
170
171 if (md == NULL)
172 md=EVP_md5();
173
174 if(do_verify && !sigfile) {
175 BIO_printf(bio_err, "No signature to verify: use the -signature option\n");
176 err = 1;
177 goto end;
178 }
179
129 if ((argc > 0) && (argv[0][0] == '-')) /* bad option */
130 {
131 BIO_printf(bio_err,"unknown option '%s'\n",*argv);
132 BIO_printf(bio_err,"options are\n");
180 if ((argc > 0) && (argv[0][0] == '-')) /* bad option */
181 {
182 BIO_printf(bio_err,"unknown option '%s'\n",*argv);
183 BIO_printf(bio_err,"options are\n");
133 BIO_printf(bio_err,"-c to output the digest with separating colons\n");
134 BIO_printf(bio_err,"-d to output debug info\n");
184 BIO_printf(bio_err,"-c to output the digest with separating colons\n");
185 BIO_printf(bio_err,"-d to output debug info\n");
186 BIO_printf(bio_err,"-hex output as hex dump\n");
187 BIO_printf(bio_err,"-binary output in binary form\n");
188 BIO_printf(bio_err,"-sign file sign digest using private key in file\n");
189 BIO_printf(bio_err,"-verify file verify a signature using public key in file\n");
190 BIO_printf(bio_err,"-prverify file verify a signature using private key in file\n");
191 BIO_printf(bio_err,"-signature file signature to verify\n");
192 BIO_printf(bio_err,"-binary output in binary form\n");
193
135 BIO_printf(bio_err,"-%3s to use the %s message digest algorithm (default)\n",
136 LN_md5,LN_md5);
137 BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
194 BIO_printf(bio_err,"-%3s to use the %s message digest algorithm (default)\n",
195 LN_md5,LN_md5);
196 BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
197 LN_md4,LN_md4);
198 BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
138 LN_md2,LN_md2);
139 BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
140 LN_sha1,LN_sha1);
141 BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
142 LN_sha,LN_sha);
143 BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
144 LN_mdc2,LN_mdc2);
145 BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
146 LN_ripemd160,LN_ripemd160);
147 err=1;
148 goto end;
149 }
199 LN_md2,LN_md2);
200 BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
201 LN_sha1,LN_sha1);
202 BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
203 LN_sha,LN_sha);
204 BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
205 LN_mdc2,LN_mdc2);
206 BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
207 LN_ripemd160,LN_ripemd160);
208 err=1;
209 goto end;
210 }
150
211
151 in=BIO_new(BIO_s_file());
152 bmd=BIO_new(BIO_f_md());
153 if (debug)
154 {
155 BIO_set_callback(in,BIO_debug_callback);
156 /* needed for windows 3.1 */
157 BIO_set_callback_arg(in,bio_err);
158 }
159
160 if ((in == NULL) || (bmd == NULL))
161 {
162 ERR_print_errors(bio_err);
163 goto end;
164 }
165
212 in=BIO_new(BIO_s_file());
213 bmd=BIO_new(BIO_f_md());
214 if (debug)
215 {
216 BIO_set_callback(in,BIO_debug_callback);
217 /* needed for windows 3.1 */
218 BIO_set_callback_arg(in,bio_err);
219 }
220
221 if ((in == NULL) || (bmd == NULL))
222 {
223 ERR_print_errors(bio_err);
224 goto end;
225 }
226
227 if(out_bin == -1) {
228 if(keyfile) out_bin = 1;
229 else out_bin = 0;
230 }
231
232 if(randfile)
233 app_RAND_load_file(randfile, bio_err, 0);
234
235 if(outfile) {
236 if(out_bin)
237 out = BIO_new_file(outfile, "wb");
238 else out = BIO_new_file(outfile, "w");
239 } else {
240 out = BIO_new_fp(stdout, BIO_NOCLOSE);
241#ifdef VMS
242 {
243 BIO *tmpbio = BIO_new(BIO_f_linebuffer());
244 out = BIO_push(tmpbio, out);
245 }
246#endif
247 }
248
249 if(!out) {
250 BIO_printf(bio_err, "Error opening output file %s\n",
251 outfile ? outfile : "(stdout)");
252 ERR_print_errors(bio_err);
253 goto end;
254 }
255
256 if(keyfile) {
257 BIO *keybio;
258 keybio = BIO_new_file(keyfile, "r");
259 if(!keybio) {
260 BIO_printf(bio_err, "Error opening key file %s\n",
261 keyfile);
262 ERR_print_errors(bio_err);
263 goto end;
264 }
265
266 if(want_pub)
267 sigkey = PEM_read_bio_PUBKEY(keybio, NULL, NULL, NULL);
268 else sigkey = PEM_read_bio_PrivateKey(keybio, NULL, NULL, NULL);
269 BIO_free(keybio);
270 if(!sigkey) {
271 BIO_printf(bio_err, "Error reading key file %s\n",
272 keyfile);
273 ERR_print_errors(bio_err);
274 goto end;
275 }
276 }
277
278 if(sigfile && sigkey) {
279 BIO *sigbio;
280 sigbio = BIO_new_file(sigfile, "rb");
281 siglen = EVP_PKEY_size(sigkey);
282 sigbuf = OPENSSL_malloc(siglen);
283 if(!sigbio) {
284 BIO_printf(bio_err, "Error opening signature file %s\n",
285 sigfile);
286 ERR_print_errors(bio_err);
287 goto end;
288 }
289 siglen = BIO_read(sigbio, sigbuf, siglen);
290 BIO_free(sigbio);
291 if(siglen <= 0) {
292 BIO_printf(bio_err, "Error reading signature file %s\n",
293 sigfile);
294 ERR_print_errors(bio_err);
295 goto end;
296 }
297 }
298
299
300
166 /* we use md as a filter, reading from 'in' */
167 BIO_set_md(bmd,md);
168 inp=BIO_push(bmd,in);
169
170 if (argc == 0)
171 {
172 BIO_set_fp(in,stdin,BIO_NOCLOSE);
301 /* we use md as a filter, reading from 'in' */
302 BIO_set_md(bmd,md);
303 inp=BIO_push(bmd,in);
304
305 if (argc == 0)
306 {
307 BIO_set_fp(in,stdin,BIO_NOCLOSE);
173 do_fp(buf,inp,separator);
308 do_fp(out, buf,inp,separator, out_bin, sigkey, sigbuf, siglen);
174 }
175 else
176 {
177 name=OBJ_nid2sn(md->type);
178 for (i=0; i<argc; i++)
179 {
180 if (BIO_read_filename(in,argv[i]) <= 0)
181 {
182 perror(argv[i]);
183 err++;
184 continue;
185 }
309 }
310 else
311 {
312 name=OBJ_nid2sn(md->type);
313 for (i=0; i<argc; i++)
314 {
315 if (BIO_read_filename(in,argv[i]) <= 0)
316 {
317 perror(argv[i]);
318 err++;
319 continue;
320 }
186 printf("%s(%s)= ",name,argv[i]);
187 do_fp(buf,inp,separator);
321 if(!out_bin) BIO_printf(out, "%s(%s)= ",name,argv[i]);
322 do_fp(out, buf,inp,separator, out_bin, sigkey,
323 sigbuf, siglen);
188 (void)BIO_reset(bmd);
189 }
190 }
191end:
192 if (buf != NULL)
193 {
194 memset(buf,0,BUFSIZE);
324 (void)BIO_reset(bmd);
325 }
326 }
327end:
328 if (buf != NULL)
329 {
330 memset(buf,0,BUFSIZE);
195 Free(buf);
331 OPENSSL_free(buf);
196 }
197 if (in != NULL) BIO_free(in);
332 }
333 if (in != NULL) BIO_free(in);
334 BIO_free_all(out);
335 EVP_PKEY_free(sigkey);
336 if(sigbuf) OPENSSL_free(sigbuf);
198 if (bmd != NULL) BIO_free(bmd);
199 EXIT(err);
200 }
201
337 if (bmd != NULL) BIO_free(bmd);
338 EXIT(err);
339 }
340
202void do_fp(unsigned char *buf, BIO *bp, int sep)
341void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, char binout,
342 EVP_PKEY *key, unsigned char *sigin, int siglen)
203 {
204 int len;
205 int i;
206
207 for (;;)
208 {
209 i=BIO_read(bp,(char *)buf,BUFSIZE);
210 if (i <= 0) break;
211 }
343 {
344 int len;
345 int i;
346
347 for (;;)
348 {
349 i=BIO_read(bp,(char *)buf,BUFSIZE);
350 if (i <= 0) break;
351 }
212 len=BIO_gets(bp,(char *)buf,BUFSIZE);
352 if(sigin)
353 {
354 EVP_MD_CTX *ctx;
355 BIO_get_md_ctx(bp, &ctx);
356 i = EVP_VerifyFinal(ctx, sigin, (unsigned int)siglen, key);
357 if(i > 0) BIO_printf(out, "Verified OK\n");
358 else if(i == 0) BIO_printf(out, "Verification Failure\n");
359 else
360 {
361 BIO_printf(bio_err, "Error Verifying Data\n");
362 ERR_print_errors(bio_err);
363 }
364 return;
365 }
366 if(key)
367 {
368 EVP_MD_CTX *ctx;
369 BIO_get_md_ctx(bp, &ctx);
370 if(!EVP_SignFinal(ctx, buf, (unsigned int *)&len, key))
371 {
372 BIO_printf(bio_err, "Error Signing Data\n");
373 ERR_print_errors(bio_err);
374 return;
375 }
376 }
377 else
378 len=BIO_gets(bp,(char *)buf,BUFSIZE);
213
379
214 for (i=0; i<len; i++)
380 if(binout) BIO_write(out, buf, len);
381 else
215 {
382 {
216 if (sep && (i != 0))
217 putc(':',stdout);
218 printf("%02x",buf[i]);
383 for (i=0; i<len; i++)
384 {
385 if (sep && (i != 0))
386 BIO_printf(out, ":");
387 BIO_printf(out, "%02x",buf[i]);
388 }
389 BIO_printf(out, "\n");
219 }
390 }
220 printf("\n");
221 }
222
391 }
392