You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
39 lines
1.6 KiB
39 lines
1.6 KiB
3 years ago
|
diff -up openssl-3.0.0-beta2/apps/cms.c.cms-stdin openssl-3.0.0-beta2/apps/cms.c
|
||
|
|
--- openssl-3.0.0-beta2/apps/cms.c.cms-stdin 2021-08-10 16:20:07.787573587 +0200
|
||
|
|
+++ openssl-3.0.0-beta2/apps/cms.c 2021-08-10 16:23:08.500940124 +0200
|
||
|
|
@@ -278,6 +278,8 @@ static void warn_binary(const char *file
|
||
|
|
unsigned char linebuf[1024], *cur, *end;
|
||
|
|
int len;
|
||
|
|
|
||
|
|
+ if (file == NULL)
|
||
|
|
+ return; /* cannot give a warning for stdin input */
|
||
|
|
if ((bio = bio_open_default(file, 'r', FORMAT_BINARY)) == NULL)
|
||
|
|
return; /* cannot give a proper warning since there is an error */
|
||
|
|
while ((len = BIO_read(bio, linebuf, sizeof(linebuf))) > 0) {
|
||
|
|
@@ -482,13 +484,9 @@ int cms_main(int argc, char **argv)
|
||
|
|
rr_allorfirst = 1;
|
||
|
|
break;
|
||
|
|
case OPT_RCTFORM:
|
||
|
|
- if (rctformat == FORMAT_ASN1) {
|
||
|
|
- if (!opt_format(opt_arg(),
|
||
|
|
- OPT_FMT_PEMDER | OPT_FMT_SMIME, &rctformat))
|
||
|
|
- goto opthelp;
|
||
|
|
- } else {
|
||
|
|
- rcms = load_content_info(rctformat, rctin, 0, NULL, "recipient");
|
||
|
|
- }
|
||
|
|
+ if (!opt_format(opt_arg(),
|
||
|
|
+ OPT_FMT_PEMDER | OPT_FMT_SMIME, &rctformat))
|
||
|
|
+ goto opthelp;
|
||
|
|
break;
|
||
|
|
case OPT_CERTFILE:
|
||
|
|
certfile = opt_arg();
|
||
|
|
@@ -954,7 +952,7 @@ int cms_main(int argc, char **argv)
|
||
|
|
goto end;
|
||
|
|
}
|
||
|
|
|
||
|
|
- rcms = load_content_info(rctformat, rctin, 0, NULL, "recipient");
|
||
|
|
+ rcms = load_content_info(rctformat, rctin, 0, NULL, "receipt");
|
||
|
|
if (rcms == NULL)
|
||
|
|
goto end;
|
||
|
|
}
|