0ed17c0652
more tolerant starttls detection in XMPP protocol (#608239)
13 lines
860 B
Diff
13 lines
860 B
Diff
diff -up openssl-1.0.0d/apps/cms.c.keyid openssl-1.0.0d/apps/cms.c
|
|
--- openssl-1.0.0d/apps/cms.c.keyid 2009-10-18 16:42:26.000000000 +0200
|
|
+++ openssl-1.0.0d/apps/cms.c 2011-07-26 12:56:48.000000000 +0200
|
|
@@ -618,7 +618,7 @@ int MAIN(int argc, char **argv)
|
|
BIO_printf (bio_err, "-certsout file certificate output file\n");
|
|
BIO_printf (bio_err, "-signer file signer certificate file\n");
|
|
BIO_printf (bio_err, "-recip file recipient certificate file for decryption\n");
|
|
- BIO_printf (bio_err, "-skeyid use subject key identifier\n");
|
|
+ BIO_printf (bio_err, "-keyid use subject key identifier\n");
|
|
BIO_printf (bio_err, "-in file input file\n");
|
|
BIO_printf (bio_err, "-inform arg input format SMIME (default), PEM or DER\n");
|
|
BIO_printf (bio_err, "-inkey file input private key (if not signer or recipient)\n");
|