summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorjim <>2014-05-04 20:31:33 +0000
committerjim <>2014-05-04 20:31:33 +0000
commit46d0c07968bb6173e05ad5b66eca47debf0331f3 (patch)
tree545ec80bc69b7f39fa2a39b60aac4d585c63eb00 /src/lib
parent854ed69879c6c89b7d91e5ed9c3c5124b719489e (diff)
downloadopenbsd-46d0c07968bb6173e05ad5b66eca47debf0331f3.tar.gz
openbsd-46d0c07968bb6173e05ad5b66eca47debf0331f3.tar.bz2
openbsd-46d0c07968bb6173e05ad5b66eca47debf0331f3.zip
Remove trailing whitespace.
no objection jmc@
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/src/doc/apps/asn1parse.pod26
-rw-r--r--src/lib/libssl/src/doc/apps/ca.pod22
-rw-r--r--src/lib/libssl/src/doc/apps/ciphers.pod4
-rw-r--r--src/lib/libssl/src/doc/apps/cms.pod20
-rw-r--r--src/lib/libssl/src/doc/apps/config.pod14
-rw-r--r--src/lib/libssl/src/doc/apps/crl.pod2
-rw-r--r--src/lib/libssl/src/doc/apps/crl2pkcs7.pod2
-rw-r--r--src/lib/libssl/src/doc/apps/dgst.pod6
-rw-r--r--src/lib/libssl/src/doc/apps/dhparam.pod6
-rw-r--r--src/lib/libssl/src/doc/apps/dsa.pod6
-rw-r--r--src/lib/libssl/src/doc/apps/dsaparam.pod2
-rw-r--r--src/lib/libssl/src/doc/apps/ec.pod10
-rw-r--r--src/lib/libssl/src/doc/apps/ecparam.pod8
-rw-r--r--src/lib/libssl/src/doc/apps/enc.pod8
-rw-r--r--src/lib/libssl/src/doc/apps/errstr.pod4
-rw-r--r--src/lib/libssl/src/doc/apps/gendsa.pod2
-rw-r--r--src/lib/libssl/src/doc/apps/genpkey.pod8
-rw-r--r--src/lib/libssl/src/doc/apps/genrsa.pod4
-rw-r--r--src/lib/libssl/src/doc/apps/ocsp.pod8
-rw-r--r--src/lib/libssl/src/doc/apps/openssl.pod20
-rw-r--r--src/lib/libssl/src/doc/apps/pkcs12.pod2
-rw-r--r--src/lib/libssl/src/doc/apps/pkcs7.pod4
-rw-r--r--src/lib/libssl/src/doc/apps/pkcs8.pod6
-rw-r--r--src/lib/libssl/src/doc/apps/pkey.pod8
-rw-r--r--src/lib/libssl/src/doc/apps/pkeyparam.pod4
-rw-r--r--src/lib/libssl/src/doc/apps/pkeyutl.pod8
-rw-r--r--src/lib/libssl/src/doc/apps/req.pod14
-rw-r--r--src/lib/libssl/src/doc/apps/rsa.pod10
-rw-r--r--src/lib/libssl/src/doc/apps/rsautl.pod36
-rw-r--r--src/lib/libssl/src/doc/apps/s_client.pod2
-rw-r--r--src/lib/libssl/src/doc/apps/s_server.pod4
-rw-r--r--src/lib/libssl/src/doc/apps/sess_id.pod4
-rw-r--r--src/lib/libssl/src/doc/apps/smime.pod10
-rw-r--r--src/lib/libssl/src/doc/apps/ts.pod32
-rw-r--r--src/lib/libssl/src/doc/apps/verify.pod8
-rw-r--r--src/lib/libssl/src/doc/apps/x509.pod10
-rw-r--r--src/lib/libssl/src/doc/apps/x509v3_config.pod8
37 files changed, 176 insertions, 176 deletions
diff --git a/src/lib/libssl/src/doc/apps/asn1parse.pod b/src/lib/libssl/src/doc/apps/asn1parse.pod
index f7bb926211..18f5de1212 100644
--- a/src/lib/libssl/src/doc/apps/asn1parse.pod
+++ b/src/lib/libssl/src/doc/apps/asn1parse.pod
@@ -76,7 +76,7 @@ L<ASN1_generate_nconf(3)|ASN1_generate_nconf(3)> format. If B<file> only is
76present then the string is obtained from the default section using the name 76present then the string is obtained from the default section using the name
77B<asn1>. The encoded data is passed through the ASN1 parser and printed out as 77B<asn1>. The encoded data is passed through the ASN1 parser and printed out as
78though it came from a file, the contents can thus be examined and written to a 78though it came from a file, the contents can thus be examined and written to a
79file using the B<out> option. 79file using the B<out> option.
80 80
81=back 81=back
82 82
@@ -84,20 +84,20 @@ file using the B<out> option.
84 84
85The output will typically contain lines like this: 85The output will typically contain lines like this:
86 86
87 0:d=0 hl=4 l= 681 cons: SEQUENCE 87 0:d=0 hl=4 l= 681 cons: SEQUENCE
88 88
89..... 89.....
90 90
91 229:d=3 hl=3 l= 141 prim: BIT STRING 91 229:d=3 hl=3 l= 141 prim: BIT STRING
92 373:d=2 hl=3 l= 162 cons: cont [ 3 ] 92 373:d=2 hl=3 l= 162 cons: cont [ 3 ]
93 376:d=3 hl=3 l= 159 cons: SEQUENCE 93 376:d=3 hl=3 l= 159 cons: SEQUENCE
94 379:d=4 hl=2 l= 29 cons: SEQUENCE 94 379:d=4 hl=2 l= 29 cons: SEQUENCE
95 381:d=5 hl=2 l= 3 prim: OBJECT :X509v3 Subject Key Identifier 95 381:d=5 hl=2 l= 3 prim: OBJECT :X509v3 Subject Key Identifier
96 386:d=5 hl=2 l= 22 prim: OCTET STRING 96 386:d=5 hl=2 l= 22 prim: OCTET STRING
97 410:d=4 hl=2 l= 112 cons: SEQUENCE 97 410:d=4 hl=2 l= 112 cons: SEQUENCE
98 412:d=5 hl=2 l= 3 prim: OBJECT :X509v3 Authority Key Identifier 98 412:d=5 hl=2 l= 3 prim: OBJECT :X509v3 Authority Key Identifier
99 417:d=5 hl=2 l= 105 prim: OCTET STRING 99 417:d=5 hl=2 l= 105 prim: OCTET STRING
100 524:d=4 hl=2 l= 12 cons: SEQUENCE 100 524:d=4 hl=2 l= 12 cons: SEQUENCE
101 101
102..... 102.....
103 103
@@ -109,20 +109,20 @@ the contents octets.
109 109
110The B<-i> option can be used to make the output more readable. 110The B<-i> option can be used to make the output more readable.
111 111
112Some knowledge of the ASN.1 structure is needed to interpret the output. 112Some knowledge of the ASN.1 structure is needed to interpret the output.
113 113
114In this example the BIT STRING at offset 229 is the certificate public key. 114In this example the BIT STRING at offset 229 is the certificate public key.
115The contents octets of this will contain the public key information. This can 115The contents octets of this will contain the public key information. This can
116be examined using the option B<-strparse 229> to yield: 116be examined using the option B<-strparse 229> to yield:
117 117
118 0:d=0 hl=3 l= 137 cons: SEQUENCE 118 0:d=0 hl=3 l= 137 cons: SEQUENCE
119 3:d=1 hl=3 l= 129 prim: INTEGER :E5D21E1F5C8D208EA7A2166C7FAF9F6BDF2059669C60876DDB70840F1A5AAFA59699FE471F379F1DD6A487E7D5409AB6A88D4A9746E24B91D8CF55DB3521015460C8EDE44EE8A4189F7A7BE77D6CD3A9AF2696F486855CF58BF0EDF2B4068058C7A947F52548DDF7E15E96B385F86422BEA9064A3EE9E1158A56E4A6F47E5897 119 3:d=1 hl=3 l= 129 prim: INTEGER :E5D21E1F5C8D208EA7A2166C7FAF9F6BDF2059669C60876DDB70840F1A5AAFA59699FE471F379F1DD6A487E7D5409AB6A88D4A9746E24B91D8CF55DB3521015460C8EDE44EE8A4189F7A7BE77D6CD3A9AF2696F486855CF58BF0EDF2B4068058C7A947F52548DDF7E15E96B385F86422BEA9064A3EE9E1158A56E4A6F47E5897
120 135:d=1 hl=2 l= 3 prim: INTEGER :010001 120 135:d=1 hl=2 l= 3 prim: INTEGER :010001
121 121
122=head1 NOTES 122=head1 NOTES
123 123
124If an OID is not part of OpenSSL's internal table it will be represented in 124If an OID is not part of OpenSSL's internal table it will be represented in
125numerical form (for example 1.2.3.4). The file passed to the B<-oid> option 125numerical form (for example 1.2.3.4). The file passed to the B<-oid> option
126allows additional OIDs to be included. Each line consists of three columns, 126allows additional OIDs to be included. Each line consists of three columns,
127the first column is the OID in numerical format and should be followed by white 127the first column is the OID in numerical format and should be followed by white
128space. The second column is the "short name" which is a single word followed 128space. The second column is the "short name" which is a single word followed
diff --git a/src/lib/libssl/src/doc/apps/ca.pod b/src/lib/libssl/src/doc/apps/ca.pod
index 9ff0cc3612..7294627d16 100644
--- a/src/lib/libssl/src/doc/apps/ca.pod
+++ b/src/lib/libssl/src/doc/apps/ca.pod
@@ -88,7 +88,7 @@ section for information on the required format.
88=item B<-infiles> 88=item B<-infiles>
89 89
90if present this should be the last option, all subsequent arguments 90if present this should be the last option, all subsequent arguments
91are assumed to the the names of files containing certificate requests. 91are assumed to the the names of files containing certificate requests.
92 92
93=item B<-out filename> 93=item B<-out filename>
94 94
@@ -180,7 +180,7 @@ need this option.
180=item B<-preserveDN> 180=item B<-preserveDN>
181 181
182Normally the DN order of a certificate is the same as the order of the 182Normally the DN order of a certificate is the same as the order of the
183fields in the relevant policy section. When this option is set the order 183fields in the relevant policy section. When this option is set the order
184is the same as the request. This is largely for compatibility with the 184is the same as the request. This is largely for compatibility with the
185older IE enrollment control which would only accept certificates if their 185older IE enrollment control which would only accept certificates if their
186DNs match the order of the request. This is not needed for Xenroll. 186DNs match the order of the request. This is not needed for Xenroll.
@@ -230,7 +230,7 @@ characters may be escaped by \ (backslash), no spaces are skipped.
230 230
231=item B<-utf8> 231=item B<-utf8>
232 232
233this option causes field values to be interpreted as UTF8 strings, by 233this option causes field values to be interpreted as UTF8 strings, by
234default they are interpreted as ASCII. This means that the field 234default they are interpreted as ASCII. This means that the field
235values, whether prompted from a terminal or obtained from a 235values, whether prompted from a terminal or obtained from a
236configuration file, must be valid UTF8 strings. 236configuration file, must be valid UTF8 strings.
@@ -336,7 +336,7 @@ any) used.
336This specifies a file containing additional B<OBJECT IDENTIFIERS>. 336This specifies a file containing additional B<OBJECT IDENTIFIERS>.
337Each line of the file should consist of the numerical form of the 337Each line of the file should consist of the numerical form of the
338object identifier followed by white space then the short name followed 338object identifier followed by white space then the short name followed
339by white space and finally the long name. 339by white space and finally the long name.
340 340
341=item B<oid_section> 341=item B<oid_section>
342 342
@@ -368,7 +368,7 @@ an EGD socket (see L<RAND_egd(3)|RAND_egd(3)>).
368=item B<default_days> 368=item B<default_days>
369 369
370the same as the B<-days> option. The number of days to certify 370the same as the B<-days> option. The number of days to certify
371a certificate for. 371a certificate for.
372 372
373=item B<default_startdate> 373=item B<default_startdate>
374 374
@@ -491,7 +491,7 @@ this can be regarded more of a quirk than intended behaviour.
491 491
492The input to the B<-spkac> command line option is a Netscape 492The input to the B<-spkac> command line option is a Netscape
493signed public key and challenge. This will usually come from 493signed public key and challenge. This will usually come from
494the B<KEYGEN> tag in an HTML form to create a new private key. 494the B<KEYGEN> tag in an HTML form to create a new private key.
495It is however possible to create SPKACs using the B<spkac> utility. 495It is however possible to create SPKACs using the B<spkac> utility.
496 496
497The file should contain the variable SPKAC set to the value of 497The file should contain the variable SPKAC set to the value of
@@ -547,18 +547,18 @@ A sample configuration file with the relevant sections for B<ca>:
547 547
548 [ ca ] 548 [ ca ]
549 default_ca = CA_default # The default ca section 549 default_ca = CA_default # The default ca section
550 550
551 [ CA_default ] 551 [ CA_default ]
552 552
553 dir = ./demoCA # top dir 553 dir = ./demoCA # top dir
554 database = $dir/index.txt # index file. 554 database = $dir/index.txt # index file.
555 new_certs_dir = $dir/newcerts # new certs dir 555 new_certs_dir = $dir/newcerts # new certs dir
556 556
557 certificate = $dir/cacert.pem # The CA cert 557 certificate = $dir/cacert.pem # The CA cert
558 serial = $dir/serial # serial no file 558 serial = $dir/serial # serial no file
559 private_key = $dir/private/cakey.pem# CA private key 559 private_key = $dir/private/cakey.pem# CA private key
560 RANDFILE = $dir/private/.rand # random number file 560 RANDFILE = $dir/private/.rand # random number file
561 561
562 default_days = 365 # how long to certify for 562 default_days = 365 # how long to certify for
563 default_crl_days= 30 # how long before next CRL 563 default_crl_days= 30 # how long before next CRL
564 default_md = md5 # md to use 564 default_md = md5 # md to use
@@ -602,7 +602,7 @@ be overridden by the B<-config> command line option.
602 602
603=head1 RESTRICTIONS 603=head1 RESTRICTIONS
604 604
605The text database index file is a critical part of the process and 605The text database index file is a critical part of the process and
606if corrupted it can be difficult to fix. It is theoretically possible 606if corrupted it can be difficult to fix. It is theoretically possible
607to rebuild the index file from all the issued certificates and a current 607to rebuild the index file from all the issued certificates and a current
608CRL: however there is no option to do this. 608CRL: however there is no option to do this.
@@ -670,6 +670,6 @@ then even if a certificate is issued with CA:TRUE it will not be valid.
670=head1 SEE ALSO 670=head1 SEE ALSO
671 671
672L<req(1)|req(1)>, L<spkac(1)|spkac(1)>, L<x509(1)|x509(1)>, L<CA.pl(1)|CA.pl(1)>, 672L<req(1)|req(1)>, L<spkac(1)|spkac(1)>, L<x509(1)|x509(1)>, L<CA.pl(1)|CA.pl(1)>,
673L<config(5)|config(5)>, L<x509v3_config(5)|x509v3_config(5)> 673L<config(5)|config(5)>, L<x509v3_config(5)|x509v3_config(5)>
674 674
675=cut 675=cut
diff --git a/src/lib/libssl/src/doc/apps/ciphers.pod b/src/lib/libssl/src/doc/apps/ciphers.pod
index f44aa00a2f..757e0221b7 100644
--- a/src/lib/libssl/src/doc/apps/ciphers.pod
+++ b/src/lib/libssl/src/doc/apps/ciphers.pod
@@ -251,10 +251,10 @@ cipher suites using MD5.
251 251
252cipher suites using SHA1. 252cipher suites using SHA1.
253 253
254=item B<aGOST> 254=item B<aGOST>
255 255
256cipher suites using GOST R 34.10 (either 2001 or 94) for authenticaction 256cipher suites using GOST R 34.10 (either 2001 or 94) for authenticaction
257(needs an engine supporting GOST algorithms). 257(needs an engine supporting GOST algorithms).
258 258
259=item B<aGOST01> 259=item B<aGOST01>
260 260
diff --git a/src/lib/libssl/src/doc/apps/cms.pod b/src/lib/libssl/src/doc/apps/cms.pod
index a09588a18d..f32f5c71fa 100644
--- a/src/lib/libssl/src/doc/apps/cms.pod
+++ b/src/lib/libssl/src/doc/apps/cms.pod
@@ -143,13 +143,13 @@ B<EncrytedData> type and output the content.
143 143
144=item B<-sign_receipt> 144=item B<-sign_receipt>
145 145
146Generate and output a signed receipt for the supplied message. The input 146Generate and output a signed receipt for the supplied message. The input
147message B<must> contain a signed receipt request. Functionality is otherwise 147message B<must> contain a signed receipt request. Functionality is otherwise
148similar to the B<-sign> operation. 148similar to the B<-sign> operation.
149 149
150=item B<-verify_receipt receipt> 150=item B<-verify_receipt receipt>
151 151
152Verify a signed receipt in filename B<receipt>. The input message B<must> 152Verify a signed receipt in filename B<receipt>. The input message B<must>
153contain the original receipt request. Functionality is otherwise similar 153contain the original receipt request. Functionality is otherwise similar
154to the B<-verify> operation. 154to the B<-verify> operation.
155 155
@@ -213,7 +213,7 @@ is S/MIME and it uses the multipart/signed MIME content type.
213 213
214this option adds plain text (text/plain) MIME headers to the supplied 214this option adds plain text (text/plain) MIME headers to the supplied
215message if encrypting or signing. If decrypting or verifying it strips 215message if encrypting or signing. If decrypting or verifying it strips
216off text headers: if the decrypted or verified message is not of MIME 216off text headers: if the decrypted or verified message is not of MIME
217type text/plain then an error occurs. 217type text/plain then an error occurs.
218 218
219=item B<-noout> 219=item B<-noout>
@@ -247,11 +247,11 @@ default digest algorithm for the signing key will be used (usually SHA1).
247 247
248the encryption algorithm to use. For example triple DES (168 bits) - B<-des3> 248the encryption algorithm to use. For example triple DES (168 bits) - B<-des3>
249or 256 bit AES - B<-aes256>. Any standard algorithm name (as used by the 249or 256 bit AES - B<-aes256>. Any standard algorithm name (as used by the
250EVP_get_cipherbyname() function) can also be used preceded by a dash, for 250EVP_get_cipherbyname() function) can also be used preceded by a dash, for
251example B<-aes_128_cbc>. See L<B<enc>|enc(1)> for a list of ciphers 251example B<-aes_128_cbc>. See L<B<enc>|enc(1)> for a list of ciphers
252supported by your version of OpenSSL. 252supported by your version of OpenSSL.
253 253
254If not specified triple DES is used. Only used with B<-encrypt> and 254If not specified triple DES is used. Only used with B<-encrypt> and
255B<-EncryptedData_create> commands. 255B<-EncryptedData_create> commands.
256 256
257=item B<-nointern> 257=item B<-nointern>
@@ -338,7 +338,7 @@ address where receipts should be supplied.
338 338
339=item B<-receipt_request_to emailaddress> 339=item B<-receipt_request_to emailaddress>
340 340
341Add an explicit email address where signed receipts should be sent to. This 341Add an explicit email address where signed receipts should be sent to. This
342option B<must> but supplied if a signed receipt it requested. 342option B<must> but supplied if a signed receipt it requested.
343 343
344=item B<-receipt_request_print> 344=item B<-receipt_request_print>
@@ -366,7 +366,7 @@ B<KEKRecipientInfo> structures.
366 366
367set the encapsulated content type to B<type> if not supplied the B<Data> type 367set the encapsulated content type to B<type> if not supplied the B<Data> type
368is used. The B<type> argument can be any valid OID name in either text or 368is used. The B<type> argument can be any valid OID name in either text or
369numerical format. 369numerical format.
370 370
371=item B<-inkey file> 371=item B<-inkey file>
372 372
@@ -392,7 +392,7 @@ all others.
392=item B<cert.pem...> 392=item B<cert.pem...>
393 393
394one or more certificates of message recipients: used when encrypting 394one or more certificates of message recipients: used when encrypting
395a message. 395a message.
396 396
397=item B<-to, -from, -subject> 397=item B<-to, -from, -subject>
398 398
@@ -454,7 +454,7 @@ remains DER.
454 454
455the operation was completely successfully. 455the operation was completely successfully.
456 456
457=item 1 457=item 1
458 458
459an error occurred parsing the command options. 459an error occurred parsing the command options.
460 460
@@ -557,7 +557,7 @@ it with:
557 -----BEGIN PKCS7----- 557 -----BEGIN PKCS7-----
558 -----END PKCS7----- 558 -----END PKCS7-----
559 559
560and using the command, 560and using the command,
561 561
562 openssl cms -verify -inform PEM -in signature.pem -content content.txt 562 openssl cms -verify -inform PEM -in signature.pem -content content.txt
563 563
diff --git a/src/lib/libssl/src/doc/apps/config.pod b/src/lib/libssl/src/doc/apps/config.pod
index 25c5381b9d..d018dfce50 100644
--- a/src/lib/libssl/src/doc/apps/config.pod
+++ b/src/lib/libssl/src/doc/apps/config.pod
@@ -63,14 +63,14 @@ functionality: any sub command uses the master OpenSSL configuration file
63unless an option is used in the sub command to use an alternative configuration 63unless an option is used in the sub command to use an alternative configuration
64file. 64file.
65 65
66To enable library configuration the default section needs to contain an 66To enable library configuration the default section needs to contain an
67appropriate line which points to the main configuration section. The default 67appropriate line which points to the main configuration section. The default
68name is B<openssl_conf> which is used by the B<openssl> utility. Other 68name is B<openssl_conf> which is used by the B<openssl> utility. Other
69applications may use an alternative name such as B<myapplicaton_conf>. 69applications may use an alternative name such as B<myapplicaton_conf>.
70 70
71The configuration section should consist of a set of name value pairs which 71The configuration section should consist of a set of name value pairs which
72contain specific module configuration information. The B<name> represents 72contain specific module configuration information. The B<name> represents
73the name of the I<configuration module> the meaning of the B<value> is 73the name of the I<configuration module> the meaning of the B<value> is
74module specific: it may, for example, represent a further configuration 74module specific: it may, for example, represent a further configuration
75section containing configuration module specific information. E.g. 75section containing configuration module specific information. E.g.
76 76
@@ -103,7 +103,7 @@ B<all> the B<openssl> utility sub commands can see the new objects as well
103as any compliant applications. For example: 103as any compliant applications. For example:
104 104
105 [new_oids] 105 [new_oids]
106 106
107 some_new_oid = 1.2.3.4 107 some_new_oid = 1.2.3.4
108 some_other_oid = 1.2.3.5 108 some_other_oid = 1.2.3.5
109 109
@@ -142,7 +142,7 @@ For example:
142 [bar_section] 142 [bar_section]
143 ... "bar" ENGINE specific commands ... 143 ... "bar" ENGINE specific commands ...
144 144
145The command B<engine_id> is used to give the ENGINE name. If used this 145The command B<engine_id> is used to give the ENGINE name. If used this
146command must be first. For example: 146command must be first. For example:
147 147
148 [engine_section] 148 [engine_section]
@@ -169,7 +169,7 @@ The command B<default_algorithms> sets the default algorithms an ENGINE will
169supply using the functions B<ENGINE_set_default_string()> 169supply using the functions B<ENGINE_set_default_string()>
170 170
171If the name matches none of the above command names it is assumed to be a 171If the name matches none of the above command names it is assumed to be a
172ctrl command which is sent to the ENGINE. The value of the command is the 172ctrl command which is sent to the ENGINE. The value of the command is the
173argument to the ctrl command. If the value is the string B<EMPTY> then no 173argument to the ctrl command. If the value is the string B<EMPTY> then no
174value is sent to the command. 174value is sent to the command.
175 175
@@ -220,7 +220,7 @@ Here is a sample configuration file using some of the features
220mentioned above. 220mentioned above.
221 221
222 # This is the default section. 222 # This is the default section.
223 223
224 HOME=/temp 224 HOME=/temp
225 RANDFILE= ${ENV::HOME}/.rnd 225 RANDFILE= ${ENV::HOME}/.rnd
226 configdir=$ENV::HOME/config 226 configdir=$ENV::HOME/config
@@ -250,7 +250,7 @@ the the B<TEMP> or B<TMP> environment variables but they may not be
250set to any value at all. If you just include the environment variable 250set to any value at all. If you just include the environment variable
251names and the variable doesn't exist then this will cause an error when 251names and the variable doesn't exist then this will cause an error when
252an attempt is made to load the configuration file. By making use of the 252an attempt is made to load the configuration file. By making use of the
253default section both values can be looked up with B<TEMP> taking 253default section both values can be looked up with B<TEMP> taking
254priority and B</tmp> used if neither is defined: 254priority and B</tmp> used if neither is defined:
255 255
256 TMP=/tmp 256 TMP=/tmp
diff --git a/src/lib/libssl/src/doc/apps/crl.pod b/src/lib/libssl/src/doc/apps/crl.pod
index 1ad76a5f8c..f037428209 100644
--- a/src/lib/libssl/src/doc/apps/crl.pod
+++ b/src/lib/libssl/src/doc/apps/crl.pod
@@ -36,7 +36,7 @@ the DER form with header and footer lines.
36 36
37=item B<-outform DER|PEM> 37=item B<-outform DER|PEM>
38 38
39This specifies the output format, the options have the same meaning as the 39This specifies the output format, the options have the same meaning as the
40B<-inform> option. 40B<-inform> option.
41 41
42=item B<-in filename> 42=item B<-in filename>
diff --git a/src/lib/libssl/src/doc/apps/crl2pkcs7.pod b/src/lib/libssl/src/doc/apps/crl2pkcs7.pod
index 3797bc0df4..37bd03e316 100644
--- a/src/lib/libssl/src/doc/apps/crl2pkcs7.pod
+++ b/src/lib/libssl/src/doc/apps/crl2pkcs7.pod
@@ -69,7 +69,7 @@ Create a PKCS#7 structure from a certificate and CRL:
69Creates a PKCS#7 structure in DER format with no CRL from several 69Creates a PKCS#7 structure in DER format with no CRL from several
70different certificates: 70different certificates:
71 71
72 openssl crl2pkcs7 -nocrl -certfile newcert.pem 72 openssl crl2pkcs7 -nocrl -certfile newcert.pem
73 -certfile demoCA/cacert.pem -outform DER -out p7.der 73 -certfile demoCA/cacert.pem -outform DER -out p7.der
74 74
75=head1 NOTES 75=head1 NOTES
diff --git a/src/lib/libssl/src/doc/apps/dgst.pod b/src/lib/libssl/src/doc/apps/dgst.pod
index b035edf08e..da690472a3 100644
--- a/src/lib/libssl/src/doc/apps/dgst.pod
+++ b/src/lib/libssl/src/doc/apps/dgst.pod
@@ -6,7 +6,7 @@ dgst, md5, md4, md2, sha1, sha, mdc2, ripemd160 - message digests
6 6
7=head1 SYNOPSIS 7=head1 SYNOPSIS
8 8
9B<openssl> B<dgst> 9B<openssl> B<dgst>
10[B<-md5|-md4|-md2|-sha1|-sha|-mdc2|-ripemd160|-dss1>] 10[B<-md5|-md4|-md2|-sha1|-sha|-mdc2|-ripemd160|-dss1>]
11[B<-c>] 11[B<-c>]
12[B<-d>] 12[B<-d>]
@@ -117,7 +117,7 @@ Following options are supported by both by B<HMAC> and B<gost-mac>:
117=over 8 117=over 8
118 118
119=item B<key:string> 119=item B<key:string>
120 120
121Specifies MAC key as alphnumeric string (use if key contain printable 121Specifies MAC key as alphnumeric string (use if key contain printable
122characters only). String length must conform to any restrictions of 122characters only). String length must conform to any restrictions of
123the MAC algorithm for example exactly 32 chars for gost-mac. 123the MAC algorithm for example exactly 32 chars for gost-mac.
@@ -136,7 +136,7 @@ a file or files containing random data used to seed the random number
136generator, or an EGD socket (see L<RAND_egd(3)|RAND_egd(3)>). 136generator, or an EGD socket (see L<RAND_egd(3)|RAND_egd(3)>).
137Multiple files can be specified separated by a OS-dependent character. 137Multiple files can be specified separated by a OS-dependent character.
138The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for 138The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
139all others. 139all others.
140 140
141=item B<file...> 141=item B<file...>
142 142
diff --git a/src/lib/libssl/src/doc/apps/dhparam.pod b/src/lib/libssl/src/doc/apps/dhparam.pod
index 9edb4ff4e1..9ca63b7625 100644
--- a/src/lib/libssl/src/doc/apps/dhparam.pod
+++ b/src/lib/libssl/src/doc/apps/dhparam.pod
@@ -38,7 +38,7 @@ additional header and footer lines.
38 38
39=item B<-outform DER|PEM> 39=item B<-outform DER|PEM>
40 40
41This specifies the output format, the options have the same meaning as the 41This specifies the output format, the options have the same meaning as the
42B<-inform> option. 42B<-inform> option.
43 43
44=item B<-in> I<filename> 44=item B<-in> I<filename>
@@ -81,7 +81,7 @@ all others.
81 81
82this option specifies that a parameter set should be generated of size 82this option specifies that a parameter set should be generated of size
83I<numbits>. It must be the last option. If not present then a value of 512 83I<numbits>. It must be the last option. If not present then a value of 512
84is used. If this option is present then the input file is ignored and 84is used. If this option is present then the input file is ignored and
85parameters are generated instead. 85parameters are generated instead.
86 86
87=item B<-noout> 87=item B<-noout>
@@ -110,7 +110,7 @@ for all available algorithms.
110 110
111The program B<dhparam> combines the functionality of the programs B<dh> and 111The program B<dhparam> combines the functionality of the programs B<dh> and
112B<gendh> in previous versions of OpenSSL and SSLeay. The B<dh> and B<gendh> 112B<gendh> in previous versions of OpenSSL and SSLeay. The B<dh> and B<gendh>
113programs are retained for now but may have different purposes in future 113programs are retained for now but may have different purposes in future
114versions of OpenSSL. 114versions of OpenSSL.
115 115
116=head1 NOTES 116=head1 NOTES
diff --git a/src/lib/libssl/src/doc/apps/dsa.pod b/src/lib/libssl/src/doc/apps/dsa.pod
index ddbc9327fa..d3edad0a4a 100644
--- a/src/lib/libssl/src/doc/apps/dsa.pod
+++ b/src/lib/libssl/src/doc/apps/dsa.pod
@@ -48,7 +48,7 @@ PKCS#8 format is also accepted.
48 48
49=item B<-outform DER|PEM> 49=item B<-outform DER|PEM>
50 50
51This specifies the output format, the options have the same meaning as the 51This specifies the output format, the options have the same meaning as the
52B<-inform> option. 52B<-inform> option.
53 53
54=item B<-in filename> 54=item B<-in filename>
@@ -76,7 +76,7 @@ see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)|openssl(1)>.
76 76
77=item B<-des|-des3|-idea> 77=item B<-des|-des3|-idea>
78 78
79These options encrypt the private key with the DES, triple DES, or the 79These options encrypt the private key with the DES, triple DES, or the
80IDEA ciphers respectively before outputting it. A pass phrase is prompted for. 80IDEA ciphers respectively before outputting it. A pass phrase is prompted for.
81If none of these options is specified the key is written in plain text. This 81If none of these options is specified the key is written in plain text. This
82means that using the B<dsa> utility to read in an encrypted key with no 82means that using the B<dsa> utility to read in an encrypted key with no
@@ -138,7 +138,7 @@ To encrypt a private key using triple DES:
138 138
139 openssl dsa -in key.pem -des3 -out keyout.pem 139 openssl dsa -in key.pem -des3 -out keyout.pem
140 140
141To convert a private key from PEM to DER format: 141To convert a private key from PEM to DER format:
142 142
143 openssl dsa -in key.pem -outform DER -out keyout.der 143 openssl dsa -in key.pem -outform DER -out keyout.der
144 144
diff --git a/src/lib/libssl/src/doc/apps/dsaparam.pod b/src/lib/libssl/src/doc/apps/dsaparam.pod
index ba5ec4d72c..cb067bbd17 100644
--- a/src/lib/libssl/src/doc/apps/dsaparam.pod
+++ b/src/lib/libssl/src/doc/apps/dsaparam.pod
@@ -36,7 +36,7 @@ of the B<DER> format base64 encoded with additional header and footer lines.
36 36
37=item B<-outform DER|PEM> 37=item B<-outform DER|PEM>
38 38
39This specifies the output format, the options have the same meaning as the 39This specifies the output format, the options have the same meaning as the
40B<-inform> option. 40B<-inform> option.
41 41
42=item B<-in filename> 42=item B<-in filename>
diff --git a/src/lib/libssl/src/doc/apps/ec.pod b/src/lib/libssl/src/doc/apps/ec.pod
index 95190a9a2e..a1b2024d3b 100644
--- a/src/lib/libssl/src/doc/apps/ec.pod
+++ b/src/lib/libssl/src/doc/apps/ec.pod
@@ -28,7 +28,7 @@ B<openssl> B<ec>
28=head1 DESCRIPTION 28=head1 DESCRIPTION
29 29
30The B<ec> command processes EC keys. They can be converted between various 30The B<ec> command processes EC keys. They can be converted between various
31forms and their components printed out. B<Note> OpenSSL uses the 31forms and their components printed out. B<Note> OpenSSL uses the
32private key format specified in 'SEC 1: Elliptic Curve Cryptography' 32private key format specified in 'SEC 1: Elliptic Curve Cryptography'
33(http://www.secg.org/). To convert a OpenSSL EC private key into the 33(http://www.secg.org/). To convert a OpenSSL EC private key into the
34PKCS#8 private key format use the B<pkcs8> command. 34PKCS#8 private key format use the B<pkcs8> command.
@@ -48,7 +48,7 @@ PKCS#8 format is also accepted.
48 48
49=item B<-outform DER|PEM> 49=item B<-outform DER|PEM>
50 50
51This specifies the output format, the options have the same meaning as the 51This specifies the output format, the options have the same meaning as the
52B<-inform> option. 52B<-inform> option.
53 53
54=item B<-in filename> 54=item B<-in filename>
@@ -76,7 +76,7 @@ see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)|openssl(1)>.
76 76
77=item B<-des|-des3|-idea> 77=item B<-des|-des3|-idea>
78 78
79These options encrypt the private key with the DES, triple DES, IDEA or 79These options encrypt the private key with the DES, triple DES, IDEA or
80any other cipher supported by OpenSSL before outputting it. A pass phrase is 80any other cipher supported by OpenSSL before outputting it. A pass phrase is
81prompted for. 81prompted for.
82If none of these options is specified the key is written in plain text. This 82If none of these options is specified the key is written in plain text. This
@@ -120,7 +120,7 @@ the point conversion forms please read the X9.62 standard.
120This specifies how the elliptic curve parameters are encoded. 120This specifies how the elliptic curve parameters are encoded.
121Possible value are: B<named_curve>, i.e. the ec parameters are 121Possible value are: B<named_curve>, i.e. the ec parameters are
122specified by a OID, or B<explicit> where the ec parameters are 122specified by a OID, or B<explicit> where the ec parameters are
123explicitly given (see RFC 3279 for the definition of the 123explicitly given (see RFC 3279 for the definition of the
124EC parameters structures). The default value is B<named_curve>. 124EC parameters structures). The default value is B<named_curve>.
125B<Note> the B<implicitlyCA> alternative ,as specified in RFC 3279, 125B<Note> the B<implicitlyCA> alternative ,as specified in RFC 3279,
126is currently not implemented in OpenSSL. 126is currently not implemented in OpenSSL.
@@ -152,7 +152,7 @@ To encrypt a private key using triple DES:
152 152
153 openssl ec -in key.pem -des3 -out keyout.pem 153 openssl ec -in key.pem -des3 -out keyout.pem
154 154
155To convert a private key from PEM to DER format: 155To convert a private key from PEM to DER format:
156 156
157 openssl ec -in key.pem -outform DER -out keyout.der 157 openssl ec -in key.pem -outform DER -out keyout.der
158 158
diff --git a/src/lib/libssl/src/doc/apps/ecparam.pod b/src/lib/libssl/src/doc/apps/ecparam.pod
index d11c0a27f9..d25cee50f9 100644
--- a/src/lib/libssl/src/doc/apps/ecparam.pod
+++ b/src/lib/libssl/src/doc/apps/ecparam.pod
@@ -36,12 +36,12 @@ This command is used to manipulate or generate EC parameter files.
36 36
37This specifies the input format. The B<DER> option uses an ASN.1 DER encoded 37This specifies the input format. The B<DER> option uses an ASN.1 DER encoded
38form compatible with RFC 3279 EcpkParameters. The PEM form is the default 38form compatible with RFC 3279 EcpkParameters. The PEM form is the default
39format: it consists of the B<DER> format base64 encoded with additional 39format: it consists of the B<DER> format base64 encoded with additional
40header and footer lines. 40header and footer lines.
41 41
42=item B<-outform DER|PEM> 42=item B<-outform DER|PEM>
43 43
44This specifies the output format, the options have the same meaning as the 44This specifies the output format, the options have the same meaning as the
45B<-inform> option. 45B<-inform> option.
46 46
47=item B<-in filename> 47=item B<-in filename>
@@ -94,7 +94,7 @@ the point conversion forms please read the X9.62 standard.
94This specifies how the elliptic curve parameters are encoded. 94This specifies how the elliptic curve parameters are encoded.
95Possible value are: B<named_curve>, i.e. the ec parameters are 95Possible value are: B<named_curve>, i.e. the ec parameters are
96specified by a OID, or B<explicit> where the ec parameters are 96specified by a OID, or B<explicit> where the ec parameters are
97explicitly given (see RFC 3279 for the definition of the 97explicitly given (see RFC 3279 for the definition of the
98EC parameters structures). The default value is B<named_curve>. 98EC parameters structures). The default value is B<named_curve>.
99B<Note> the B<implicitlyCA> alternative ,as specified in RFC 3279, 99B<Note> the B<implicitlyCA> alternative ,as specified in RFC 3279,
100is currently not implemented in OpenSSL. 100is currently not implemented in OpenSSL.
@@ -133,7 +133,7 @@ PEM format EC parameters use the header and footer lines:
133 -----END EC PARAMETERS----- 133 -----END EC PARAMETERS-----
134 134
135OpenSSL is currently not able to generate new groups and therefore 135OpenSSL is currently not able to generate new groups and therefore
136B<ecparam> can only create EC parameters from known (named) curves. 136B<ecparam> can only create EC parameters from known (named) curves.
137 137
138=head1 EXAMPLES 138=head1 EXAMPLES
139 139
diff --git a/src/lib/libssl/src/doc/apps/enc.pod b/src/lib/libssl/src/doc/apps/enc.pod
index 3dee4ed992..05d454b303 100644
--- a/src/lib/libssl/src/doc/apps/enc.pod
+++ b/src/lib/libssl/src/doc/apps/enc.pod
@@ -100,7 +100,7 @@ the B<-pass> argument.
100 100
101=item B<-nosalt> 101=item B<-nosalt>
102 102
103do not use a salt 103do not use a salt
104 104
105=item B<-salt> 105=item B<-salt>
106 106
@@ -251,7 +251,7 @@ ones provided by configured engines.
251 desx DESX algorithm. 251 desx DESX algorithm.
252 252
253 gost89 GOST 28147-89 in CFB mode (provided by ccgost engine) 253 gost89 GOST 28147-89 in CFB mode (provided by ccgost engine)
254 gost89-cnt `GOST 28147-89 in CNT mode (provided by ccgost engine) 254 gost89-cnt `GOST 28147-89 in CNT mode (provided by ccgost engine)
255 255
256 idea-cbc IDEA algorithm in CBC mode 256 idea-cbc IDEA algorithm in CBC mode
257 idea same as idea-cbc 257 idea same as idea-cbc
@@ -293,11 +293,11 @@ Just base64 encode a binary file:
293 293
294Decode the same file 294Decode the same file
295 295
296 openssl base64 -d -in file.b64 -out file.bin 296 openssl base64 -d -in file.b64 -out file.bin
297 297
298Encrypt a file using triple DES in CBC mode using a prompted password: 298Encrypt a file using triple DES in CBC mode using a prompted password:
299 299
300 openssl des3 -salt -in file.txt -out file.des3 300 openssl des3 -salt -in file.txt -out file.des3
301 301
302Decrypt a file using a supplied password: 302Decrypt a file using a supplied password:
303 303
diff --git a/src/lib/libssl/src/doc/apps/errstr.pod b/src/lib/libssl/src/doc/apps/errstr.pod
index b3c6ccfc9c..b209faf75f 100644
--- a/src/lib/libssl/src/doc/apps/errstr.pod
+++ b/src/lib/libssl/src/doc/apps/errstr.pod
@@ -11,7 +11,7 @@ B<openssl errstr error_code>
11=head1 DESCRIPTION 11=head1 DESCRIPTION
12 12
13Sometimes an application will not load error message and only 13Sometimes an application will not load error message and only
14numerical forms will be available. The B<errstr> utility can be used to 14numerical forms will be available. The B<errstr> utility can be used to
15display the meaning of the hex code. The hex code is the hex digits after the 15display the meaning of the hex code. The hex code is the hex digits after the
16second colon. 16second colon.
17 17
@@ -22,7 +22,7 @@ The error code:
22 27594:error:2006D080:lib(32):func(109):reason(128):bss_file.c:107: 22 27594:error:2006D080:lib(32):func(109):reason(128):bss_file.c:107:
23 23
24can be displayed with: 24can be displayed with:
25 25
26 openssl errstr 2006D080 26 openssl errstr 2006D080
27 27
28to produce the error message: 28to produce the error message:
diff --git a/src/lib/libssl/src/doc/apps/gendsa.pod b/src/lib/libssl/src/doc/apps/gendsa.pod
index 8c7f114ca0..8488c7cef8 100644
--- a/src/lib/libssl/src/doc/apps/gendsa.pod
+++ b/src/lib/libssl/src/doc/apps/gendsa.pod
@@ -26,7 +26,7 @@ The B<gendsa> command generates a DSA private key from a DSA parameter file
26 26
27=item B<-des|-des3|-idea> 27=item B<-des|-des3|-idea>
28 28
29These options encrypt the private key with the DES, triple DES, or the 29These options encrypt the private key with the DES, triple DES, or the
30IDEA ciphers respectively before outputting it. A pass phrase is prompted for. 30IDEA ciphers respectively before outputting it. A pass phrase is prompted for.
31If none of these options is specified no encryption is used. 31If none of these options is specified no encryption is used.
32 32
diff --git a/src/lib/libssl/src/doc/apps/genpkey.pod b/src/lib/libssl/src/doc/apps/genpkey.pod
index c74d097fb3..80e91ed496 100644
--- a/src/lib/libssl/src/doc/apps/genpkey.pod
+++ b/src/lib/libssl/src/doc/apps/genpkey.pod
@@ -29,7 +29,7 @@ The B<genpkey> command generates a private key.
29=item B<-out filename> 29=item B<-out filename>
30 30
31the output filename. If this argument is not specified then standard output is 31the output filename. If this argument is not specified then standard output is
32used. 32used.
33 33
34=item B<-outform DER|PEM> 34=item B<-outform DER|PEM>
35 35
@@ -181,7 +181,7 @@ can be used.
181 181
182Generate an RSA private key using default parameters: 182Generate an RSA private key using default parameters:
183 183
184 openssl genpkey -algorithm RSA -out key.pem 184 openssl genpkey -algorithm RSA -out key.pem
185 185
186Encrypt output private key using 128 bit AES and the passphrase "hello": 186Encrypt output private key using 128 bit AES and the passphrase "hello":
187 187
@@ -199,7 +199,7 @@ Generate 1024 bit DSA parameters:
199 199
200Generate DSA key from parameters: 200Generate DSA key from parameters:
201 201
202 openssl genpkey -paramfile dsap.pem -out dsakey.pem 202 openssl genpkey -paramfile dsap.pem -out dsakey.pem
203 203
204Generate 1024 bit DH parameters: 204Generate 1024 bit DH parameters:
205 205
@@ -208,7 +208,7 @@ Generate 1024 bit DH parameters:
208 208
209Generate DH key from parameters: 209Generate DH key from parameters:
210 210
211 openssl genpkey -paramfile dhp.pem -out dhkey.pem 211 openssl genpkey -paramfile dhp.pem -out dhkey.pem
212 212
213 213
214=cut 214=cut
diff --git a/src/lib/libssl/src/doc/apps/genrsa.pod b/src/lib/libssl/src/doc/apps/genrsa.pod
index 7dcac2a779..608f237b13 100644
--- a/src/lib/libssl/src/doc/apps/genrsa.pod
+++ b/src/lib/libssl/src/doc/apps/genrsa.pod
@@ -29,7 +29,7 @@ The B<genrsa> command generates an RSA private key.
29=item B<-out filename> 29=item B<-out filename>
30 30
31the output filename. If this argument is not specified then standard output is 31the output filename. If this argument is not specified then standard output is
32used. 32used.
33 33
34=item B<-passout arg> 34=item B<-passout arg>
35 35
@@ -38,7 +38,7 @@ see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)|openssl(1)>.
38 38
39=item B<-des|-des3|-idea> 39=item B<-des|-des3|-idea>
40 40
41These options encrypt the private key with the DES, triple DES, or the 41These options encrypt the private key with the DES, triple DES, or the
42IDEA ciphers respectively before outputting it. If none of these options is 42IDEA ciphers respectively before outputting it. If none of these options is
43specified no encryption is used. If encryption is used a pass phrase is prompted 43specified no encryption is used. If encryption is used a pass phrase is prompted
44for if it is not supplied via the B<-passout> argument. 44for if it is not supplied via the B<-passout> argument.
diff --git a/src/lib/libssl/src/doc/apps/ocsp.pod b/src/lib/libssl/src/doc/apps/ocsp.pod
index af2e12e418..435c83fb85 100644
--- a/src/lib/libssl/src/doc/apps/ocsp.pod
+++ b/src/lib/libssl/src/doc/apps/ocsp.pod
@@ -210,7 +210,7 @@ check is not performed.
210=item B<-md5|-sha1|-sha256|-ripemod160|...> 210=item B<-md5|-sha1|-sha256|-ripemod160|...>
211 211
212this option sets digest algorithm to use for certificate identification 212this option sets digest algorithm to use for certificate identification
213in the OCSP request. By default SHA-1 is used. 213in the OCSP request. By default SHA-1 is used.
214 214
215=back 215=back
216 216
@@ -263,12 +263,12 @@ option.
263 263
264=item B<-nrequest number> 264=item B<-nrequest number>
265 265
266The OCSP server will exit after receiving B<number> requests, default unlimited. 266The OCSP server will exit after receiving B<number> requests, default unlimited.
267 267
268=item B<-nmin minutes>, B<-ndays days> 268=item B<-nmin minutes>, B<-ndays days>
269 269
270Number of minutes or days when fresh revocation information is available: used in the 270Number of minutes or days when fresh revocation information is available: used in the
271B<nextUpdate> field. If neither option is present then the B<nextUpdate> field is 271B<nextUpdate> field. If neither option is present then the B<nextUpdate> field is
272omitted meaning fresh revocation information is immediately available. 272omitted meaning fresh revocation information is immediately available.
273 273
274=back 274=back
@@ -338,7 +338,7 @@ Create an OCSP request and write it to a file:
338 338
339 openssl ocsp -issuer issuer.pem -cert c1.pem -cert c2.pem -reqout req.der 339 openssl ocsp -issuer issuer.pem -cert c1.pem -cert c2.pem -reqout req.der
340 340
341Send a query to an OCSP responder with URL http://ocsp.myhost.com/ save the 341Send a query to an OCSP responder with URL http://ocsp.myhost.com/ save the
342response to a file and print it out in text form 342response to a file and print it out in text form
343 343
344 openssl ocsp -issuer issuer.pem -cert c1.pem -cert c2.pem \ 344 openssl ocsp -issuer issuer.pem -cert c1.pem -cert c2.pem \
diff --git a/src/lib/libssl/src/doc/apps/openssl.pod b/src/lib/libssl/src/doc/apps/openssl.pod
index 64a160c20a..c40b50d950 100644
--- a/src/lib/libssl/src/doc/apps/openssl.pod
+++ b/src/lib/libssl/src/doc/apps/openssl.pod
@@ -23,12 +23,12 @@ v2/v3) and Transport Layer Security (TLS v1) network protocols and related
23cryptography standards required by them. 23cryptography standards required by them.
24 24
25The B<openssl> program is a command line tool for using the various 25The B<openssl> program is a command line tool for using the various
26cryptography functions of OpenSSL's B<crypto> library from the shell. 26cryptography functions of OpenSSL's B<crypto> library from the shell.
27It can be used for 27It can be used for
28 28
29 o Creation and management of private keys, public keys and parameters 29 o Creation and management of private keys, public keys and parameters
30 o Public key cryptographic operations 30 o Public key cryptographic operations
31 o Creation of X.509 certificates, CSRs and CRLs 31 o Creation of X.509 certificates, CSRs and CRLs
32 o Calculation of Message Digests 32 o Calculation of Message Digests
33 o Encryption and Decryption with Ciphers 33 o Encryption and Decryption with Ciphers
34 o SSL/TLS Client and Server Tests 34 o SSL/TLS Client and Server Tests
@@ -75,7 +75,7 @@ Parse an ASN.1 sequence.
75 75
76=item L<B<ca>|ca(1)> 76=item L<B<ca>|ca(1)>
77 77
78Certificate Authority (CA) Management. 78Certificate Authority (CA) Management.
79 79
80=item L<B<ciphers>|ciphers(1)> 80=item L<B<ciphers>|ciphers(1)>
81 81
@@ -104,7 +104,7 @@ Obsoleted by L<B<dhparam>|dhparam(1)>.
104 104
105=item L<B<dhparam>|dhparam(1)> 105=item L<B<dhparam>|dhparam(1)>
106 106
107Generation and Management of Diffie-Hellman Parameters. Superseded by 107Generation and Management of Diffie-Hellman Parameters. Superseded by
108L<B<genpkey>|genpkey(1)> and L<B<pkeyparam>|pkeyparam(1)> 108L<B<genpkey>|genpkey(1)> and L<B<pkeyparam>|pkeyparam(1)>
109 109
110 110
@@ -114,7 +114,7 @@ DSA Data Management.
114 114
115=item L<B<dsaparam>|dsaparam(1)> 115=item L<B<dsaparam>|dsaparam(1)>
116 116
117DSA Parameter Generation and Management. Superseded by 117DSA Parameter Generation and Management. Superseded by
118L<B<genpkey>|genpkey(1)> and L<B<pkeyparam>|pkeyparam(1)> 118L<B<genpkey>|genpkey(1)> and L<B<pkeyparam>|pkeyparam(1)>
119 119
120=item L<B<ec>|ec(1)> 120=item L<B<ec>|ec(1)>
@@ -144,7 +144,7 @@ Obsoleted by L<B<dhparam>|dhparam(1)>.
144 144
145=item L<B<gendsa>|gendsa(1)> 145=item L<B<gendsa>|gendsa(1)>
146 146
147Generation of DSA Private Key from Parameters. Superseded by 147Generation of DSA Private Key from Parameters. Superseded by
148L<B<genpkey>|genpkey(1)> and L<B<pkey>|pkey(1)> 148L<B<genpkey>|genpkey(1)> and L<B<pkey>|pkey(1)>
149 149
150=item L<B<genpkey>|genpkey(1)> 150=item L<B<genpkey>|genpkey(1)>
@@ -279,11 +279,11 @@ MDC2 Digest
279 279
280RMD-160 Digest 280RMD-160 Digest
281 281
282=item B<sha> 282=item B<sha>
283 283
284SHA Digest 284SHA Digest
285 285
286=item B<sha1> 286=item B<sha1>
287 287
288SHA-1 Digest 288SHA-1 Digest
289 289
@@ -408,7 +408,7 @@ L<rsautl(1)|rsautl(1)>, L<s_client(1)|s_client(1)>,
408L<s_server(1)|s_server(1)>, L<s_time(1)|s_time(1)>, 408L<s_server(1)|s_server(1)>, L<s_time(1)|s_time(1)>,
409L<smime(1)|smime(1)>, L<spkac(1)|spkac(1)>, 409L<smime(1)|smime(1)>, L<spkac(1)|spkac(1)>,
410L<verify(1)|verify(1)>, L<version(1)|version(1)>, L<x509(1)|x509(1)>, 410L<verify(1)|verify(1)>, L<version(1)|version(1)>, L<x509(1)|x509(1)>,
411L<crypto(3)|crypto(3)>, L<ssl(3)|ssl(3)>, L<x509v3_config(5)|x509v3_config(5)> 411L<crypto(3)|crypto(3)>, L<ssl(3)|ssl(3)>, L<x509v3_config(5)|x509v3_config(5)>
412 412
413=head1 HISTORY 413=head1 HISTORY
414 414
diff --git a/src/lib/libssl/src/doc/apps/pkcs12.pod b/src/lib/libssl/src/doc/apps/pkcs12.pod
index 8e0d91798a..4070c58e53 100644
--- a/src/lib/libssl/src/doc/apps/pkcs12.pod
+++ b/src/lib/libssl/src/doc/apps/pkcs12.pod
@@ -322,7 +322,7 @@ Output only client certificates to a file:
322 openssl pkcs12 -in file.p12 -clcerts -out file.pem 322 openssl pkcs12 -in file.p12 -clcerts -out file.pem
323 323
324Don't encrypt the private key: 324Don't encrypt the private key:
325 325
326 openssl pkcs12 -in file.p12 -out file.pem -nodes 326 openssl pkcs12 -in file.p12 -out file.pem -nodes
327 327
328Print some info about a PKCS#12 file: 328Print some info about a PKCS#12 file:
diff --git a/src/lib/libssl/src/doc/apps/pkcs7.pod b/src/lib/libssl/src/doc/apps/pkcs7.pod
index acfb8100f0..13c5cad262 100644
--- a/src/lib/libssl/src/doc/apps/pkcs7.pod
+++ b/src/lib/libssl/src/doc/apps/pkcs7.pod
@@ -32,7 +32,7 @@ the DER form with header and footer lines.
32 32
33=item B<-outform DER|PEM> 33=item B<-outform DER|PEM>
34 34
35This specifies the output format, the options have the same meaning as the 35This specifies the output format, the options have the same meaning as the
36B<-inform> option. 36B<-inform> option.
37 37
38=item B<-in filename> 38=item B<-in filename>
@@ -95,7 +95,7 @@ For compatibility with some CAs it will also accept:
95 95
96There is no option to print out all the fields of a PKCS#7 file. 96There is no option to print out all the fields of a PKCS#7 file.
97 97
98This PKCS#7 routines only understand PKCS#7 v 1.5 as specified in RFC2315 they 98This PKCS#7 routines only understand PKCS#7 v 1.5 as specified in RFC2315 they
99cannot currently parse, for example, the new CMS as described in RFC2630. 99cannot currently parse, for example, the new CMS as described in RFC2630.
100 100
101=head1 SEE ALSO 101=head1 SEE ALSO
diff --git a/src/lib/libssl/src/doc/apps/pkcs8.pod b/src/lib/libssl/src/doc/apps/pkcs8.pod
index 84abee78f3..d15c89bbbc 100644
--- a/src/lib/libssl/src/doc/apps/pkcs8.pod
+++ b/src/lib/libssl/src/doc/apps/pkcs8.pod
@@ -49,7 +49,7 @@ private key is used.
49 49
50=item B<-outform DER|PEM> 50=item B<-outform DER|PEM>
51 51
52This specifies the output format, the options have the same meaning as the 52This specifies the output format, the options have the same meaning as the
53B<-inform> option. 53B<-inform> option.
54 54
55=item B<-in filename> 55=item B<-in filename>
@@ -109,7 +109,7 @@ the public and private keys respectively.
109This option enables the use of PKCS#5 v2.0 algorithms. Normally PKCS#8 109This option enables the use of PKCS#5 v2.0 algorithms. Normally PKCS#8
110private keys are encrypted with the password based encryption algorithm 110private keys are encrypted with the password based encryption algorithm
111called B<pbeWithMD5AndDES-CBC> this uses 56 bit DES encryption but it 111called B<pbeWithMD5AndDES-CBC> this uses 56 bit DES encryption but it
112was the strongest encryption algorithm supported in PKCS#5 v1.5. Using 112was the strongest encryption algorithm supported in PKCS#5 v1.5. Using
113the B<-v2> option PKCS#5 v2.0 algorithms are used which can use any 113the B<-v2> option PKCS#5 v2.0 algorithms are used which can use any
114encryption algorithm such as 168 bit triple DES or 128 bit RC2 however 114encryption algorithm such as 168 bit triple DES or 128 bit RC2 however
115not many implementations support PKCS#5 v2.0 yet. If you are just using 115not many implementations support PKCS#5 v2.0 yet. If you are just using
@@ -238,6 +238,6 @@ the old format at present.
238=head1 SEE ALSO 238=head1 SEE ALSO
239 239
240L<dsa(1)|dsa(1)>, L<rsa(1)|rsa(1)>, L<genrsa(1)|genrsa(1)>, 240L<dsa(1)|dsa(1)>, L<rsa(1)|rsa(1)>, L<genrsa(1)|genrsa(1)>,
241L<gendsa(1)|gendsa(1)> 241L<gendsa(1)|gendsa(1)>
242 242
243=cut 243=cut
diff --git a/src/lib/libssl/src/doc/apps/pkey.pod b/src/lib/libssl/src/doc/apps/pkey.pod
index 4851223f3f..77166dd877 100644
--- a/src/lib/libssl/src/doc/apps/pkey.pod
+++ b/src/lib/libssl/src/doc/apps/pkey.pod
@@ -37,7 +37,7 @@ This specifies the input format DER or PEM.
37 37
38=item B<-outform DER|PEM> 38=item B<-outform DER|PEM>
39 39
40This specifies the output format, the options have the same meaning as the 40This specifies the output format, the options have the same meaning as the
41B<-inform> option. 41B<-inform> option.
42 42
43=item B<-in filename> 43=item B<-in filename>
@@ -71,7 +71,7 @@ name accepted by EVP_get_cipherbyname() is acceptable such as B<des3>.
71=item B<-text> 71=item B<-text>
72 72
73prints out the various public or private key components in 73prints out the various public or private key components in
74plain text in addition to the encoded version. 74plain text in addition to the encoded version.
75 75
76=item B<-text_pub> 76=item B<-text_pub>
77 77
@@ -111,7 +111,7 @@ To encrypt a private key using triple DES:
111 111
112 openssl pkey -in key.pem -des3 -out keyout.pem 112 openssl pkey -in key.pem -des3 -out keyout.pem
113 113
114To convert a private key from PEM to DER format: 114To convert a private key from PEM to DER format:
115 115
116 openssl pkey -in key.pem -outform DER -out keyout.der 116 openssl pkey -in key.pem -outform DER -out keyout.der
117 117
@@ -130,6 +130,6 @@ To just output the public part of a private key:
130=head1 SEE ALSO 130=head1 SEE ALSO
131 131
132L<genpkey(1)|genpkey(1)>, L<rsa(1)|rsa(1)>, L<pkcs8(1)|pkcs8(1)>, 132L<genpkey(1)|genpkey(1)>, L<rsa(1)|rsa(1)>, L<pkcs8(1)|pkcs8(1)>,
133L<dsa(1)|dsa(1)>, L<genrsa(1)|genrsa(1)>, L<gendsa(1)|gendsa(1)> 133L<dsa(1)|dsa(1)>, L<genrsa(1)|genrsa(1)>, L<gendsa(1)|gendsa(1)>
134 134
135=cut 135=cut
diff --git a/src/lib/libssl/src/doc/apps/pkeyparam.pod b/src/lib/libssl/src/doc/apps/pkeyparam.pod
index 154f6721af..81495d2d52 100644
--- a/src/lib/libssl/src/doc/apps/pkeyparam.pod
+++ b/src/lib/libssl/src/doc/apps/pkeyparam.pod
@@ -35,7 +35,7 @@ this option is not specified.
35 35
36=item B<-text> 36=item B<-text>
37 37
38prints out the parameters in plain text in addition to the encoded version. 38prints out the parameters in plain text in addition to the encoded version.
39 39
40=item B<-noout> 40=item B<-noout>
41 41
@@ -64,6 +64,6 @@ PEM format is supported because the key type is determined by the PEM headers.
64=head1 SEE ALSO 64=head1 SEE ALSO
65 65
66L<genpkey(1)|genpkey(1)>, L<rsa(1)|rsa(1)>, L<pkcs8(1)|pkcs8(1)>, 66L<genpkey(1)|genpkey(1)>, L<rsa(1)|rsa(1)>, L<pkcs8(1)|pkcs8(1)>,
67L<dsa(1)|dsa(1)>, L<genrsa(1)|genrsa(1)>, L<gendsa(1)|gendsa(1)> 67L<dsa(1)|dsa(1)>, L<genrsa(1)|genrsa(1)>, L<gendsa(1)|gendsa(1)>
68 68
69=cut 69=cut
diff --git a/src/lib/libssl/src/doc/apps/pkeyutl.pod b/src/lib/libssl/src/doc/apps/pkeyutl.pod
index 27be9a9007..a88380a7a8 100644
--- a/src/lib/libssl/src/doc/apps/pkeyutl.pod
+++ b/src/lib/libssl/src/doc/apps/pkeyutl.pod
@@ -80,11 +80,11 @@ for all available algorithms.
80 80
81=item B<-pubin> 81=item B<-pubin>
82 82
83the input file is a public key. 83the input file is a public key.
84 84
85=item B<-certin> 85=item B<-certin>
86 86
87the input is a certificate containing a public key. 87the input is a certificate containing a public key.
88 88
89=item B<-rev> 89=item B<-rev>
90 90
@@ -141,7 +141,7 @@ EVP_get_digestbyname() function for example B<sha1>.
141=head1 RSA ALGORITHM 141=head1 RSA ALGORITHM
142 142
143The RSA algorithm supports encrypt, decrypt, sign, verify and verifyrecover 143The RSA algorithm supports encrypt, decrypt, sign, verify and verifyrecover
144operations in general. Some padding modes only support some of these 144operations in general. Some padding modes only support some of these
145operations however. 145operations however.
146 146
147=over 4 147=over 4
@@ -152,7 +152,7 @@ This sets the RSA padding mode. Acceptable values for B<mode> are B<pkcs1> for
152PKCS#1 padding, B<sslv23> for SSLv23 padding, B<none> for no padding, B<oaep> 152PKCS#1 padding, B<sslv23> for SSLv23 padding, B<none> for no padding, B<oaep>
153for B<OAEP> mode, B<x931> for X9.31 mode and B<pss> for PSS. 153for B<OAEP> mode, B<x931> for X9.31 mode and B<pss> for PSS.
154 154
155In PKCS#1 padding if the message digest is not set then the supplied data is 155In PKCS#1 padding if the message digest is not set then the supplied data is
156signed or verified directly instead of using a B<DigestInfo> structure. If a 156signed or verified directly instead of using a B<DigestInfo> structure. If a
157digest is set then the a B<DigestInfo> structure is used and its the length 157digest is set then the a B<DigestInfo> structure is used and its the length
158must correspond to the digest type. 158must correspond to the digest type.
diff --git a/src/lib/libssl/src/doc/apps/req.pod b/src/lib/libssl/src/doc/apps/req.pod
index 0730d117b3..4f6d64766d 100644
--- a/src/lib/libssl/src/doc/apps/req.pod
+++ b/src/lib/libssl/src/doc/apps/req.pod
@@ -68,7 +68,7 @@ footer lines.
68 68
69=item B<-outform DER|PEM> 69=item B<-outform DER|PEM>
70 70
71This specifies the output format, the options have the same meaning as the 71This specifies the output format, the options have the same meaning as the
72B<-inform> option. 72B<-inform> option.
73 73
74=item B<-in filename> 74=item B<-in filename>
@@ -261,7 +261,7 @@ a variety of purposes.
261 261
262=item B<-utf8> 262=item B<-utf8>
263 263
264this option causes field values to be interpreted as UTF8 strings, by 264this option causes field values to be interpreted as UTF8 strings, by
265default they are interpreted as ASCII. This means that the field 265default they are interpreted as ASCII. This means that the field
266values, whether prompted from a terminal or obtained from a 266values, whether prompted from a terminal or obtained from a
267configuration file, must be valid UTF8 strings. 267configuration file, must be valid UTF8 strings.
@@ -276,7 +276,7 @@ set multiple options. See the L<x509(1)|x509(1)> manual page for details.
276=item B<-reqopt> 276=item B<-reqopt>
277 277
278customise the output format used with B<-text>. The B<option> argument can be 278customise the output format used with B<-text>. The B<option> argument can be
279a single option or multiple options separated by commas. 279a single option or multiple options separated by commas.
280 280
281See discission of the B<-certopt> parameter in the L<B<x509>|x509(1)> 281See discission of the B<-certopt> parameter in the L<B<x509>|x509(1)>
282command. 282command.
@@ -363,7 +363,7 @@ overridden by the B<-keyout> option.
363This specifies a file containing additional B<OBJECT IDENTIFIERS>. 363This specifies a file containing additional B<OBJECT IDENTIFIERS>.
364Each line of the file should consist of the numerical form of the 364Each line of the file should consist of the numerical form of the
365object identifier followed by white space then the short name followed 365object identifier followed by white space then the short name followed
366by white space and finally the long name. 366by white space and finally the long name.
367 367
368=item B<oid_section> 368=item B<oid_section>
369 369
@@ -396,7 +396,7 @@ This option masks out the use of certain string types in certain
396fields. Most users will not need to change this option. 396fields. Most users will not need to change this option.
397 397
398It can be set to several values B<default> which is also the default 398It can be set to several values B<default> which is also the default
399option uses PrintableStrings, T61Strings and BMPStrings if the 399option uses PrintableStrings, T61Strings and BMPStrings if the
400B<pkix> value is used then only PrintableStrings and BMPStrings will 400B<pkix> value is used then only PrintableStrings and BMPStrings will
401be used. This follows the PKIX recommendation in RFC2459. If the 401be used. This follows the PKIX recommendation in RFC2459. If the
402B<utf8only> option is used then only UTF8Strings will be used: this 402B<utf8only> option is used then only UTF8Strings will be used: this
@@ -408,7 +408,7 @@ problems with BMPStrings and UTF8Strings: in particular Netscape.
408 408
409this specifies the configuration file section containing a list of 409this specifies the configuration file section containing a list of
410extensions to add to the certificate request. It can be overridden 410extensions to add to the certificate request. It can be overridden
411by the B<-reqexts> command line switch. See the 411by the B<-reqexts> command line switch. See the
412L<x509v3_config(5)|x509v3_config(5)> manual page for details of the 412L<x509v3_config(5)|x509v3_config(5)> manual page for details of the
413extension section format. 413extension section format.
414 414
@@ -673,6 +673,6 @@ address in subjectAltName should be input by the user.
673 673
674L<x509(1)|x509(1)>, L<ca(1)|ca(1)>, L<genrsa(1)|genrsa(1)>, 674L<x509(1)|x509(1)>, L<ca(1)|ca(1)>, L<genrsa(1)|genrsa(1)>,
675L<gendsa(1)|gendsa(1)>, L<config(5)|config(5)>, 675L<gendsa(1)|gendsa(1)>, L<config(5)|config(5)>,
676L<x509v3_config(5)|x509v3_config(5)> 676L<x509v3_config(5)|x509v3_config(5)>
677 677
678=cut 678=cut
diff --git a/src/lib/libssl/src/doc/apps/rsa.pod b/src/lib/libssl/src/doc/apps/rsa.pod
index d7d784d52b..e1ba8e629f 100644
--- a/src/lib/libssl/src/doc/apps/rsa.pod
+++ b/src/lib/libssl/src/doc/apps/rsa.pod
@@ -51,7 +51,7 @@ section.
51 51
52=item B<-outform DER|NET|PEM> 52=item B<-outform DER|NET|PEM>
53 53
54This specifies the output format, the options have the same meaning as the 54This specifies the output format, the options have the same meaning as the
55B<-inform> option. 55B<-inform> option.
56 56
57=item B<-in filename> 57=item B<-in filename>
@@ -84,7 +84,7 @@ keys.
84 84
85=item B<-des|-des3|-idea> 85=item B<-des|-des3|-idea>
86 86
87These options encrypt the private key with the DES, triple DES, or the 87These options encrypt the private key with the DES, triple DES, or the
88IDEA ciphers respectively before outputting it. A pass phrase is prompted for. 88IDEA ciphers respectively before outputting it. A pass phrase is prompted for.
89If none of these options is specified the key is written in plain text. This 89If none of these options is specified the key is written in plain text. This
90means that using the B<rsa> utility to read in an encrypted key with no 90means that using the B<rsa> utility to read in an encrypted key with no
@@ -95,7 +95,7 @@ These options can only be used with PEM format output files.
95=item B<-text> 95=item B<-text>
96 96
97prints out the various public or private key components in 97prints out the various public or private key components in
98plain text in addition to the encoded version. 98plain text in addition to the encoded version.
99 99
100=item B<-noout> 100=item B<-noout>
101 101
@@ -172,7 +172,7 @@ To encrypt a private key using triple DES:
172 172
173 openssl rsa -in key.pem -des3 -out keyout.pem 173 openssl rsa -in key.pem -des3 -out keyout.pem
174 174
175To convert a private key from PEM to DER format: 175To convert a private key from PEM to DER format:
176 176
177 openssl rsa -in key.pem -outform DER -out keyout.der 177 openssl rsa -in key.pem -outform DER -out keyout.der
178 178
@@ -199,6 +199,6 @@ without having to manually edit them.
199=head1 SEE ALSO 199=head1 SEE ALSO
200 200
201L<pkcs8(1)|pkcs8(1)>, L<dsa(1)|dsa(1)>, L<genrsa(1)|genrsa(1)>, 201L<pkcs8(1)|pkcs8(1)>, L<dsa(1)|dsa(1)>, L<genrsa(1)|genrsa(1)>,
202L<gendsa(1)|gendsa(1)> 202L<gendsa(1)|gendsa(1)>
203 203
204=cut 204=cut
diff --git a/src/lib/libssl/src/doc/apps/rsautl.pod b/src/lib/libssl/src/doc/apps/rsautl.pod
index 1a498c2f62..6b23cbcc56 100644
--- a/src/lib/libssl/src/doc/apps/rsautl.pod
+++ b/src/lib/libssl/src/doc/apps/rsautl.pod
@@ -47,11 +47,11 @@ the input key file, by default it should be an RSA private key.
47 47
48=item B<-pubin> 48=item B<-pubin>
49 49
50the input file is an RSA public key. 50the input file is an RSA public key.
51 51
52=item B<-certin> 52=item B<-certin>
53 53
54the input is a certificate containing an RSA public key. 54the input is a certificate containing an RSA public key.
55 55
56=item B<-sign> 56=item B<-sign>
57 57
@@ -126,24 +126,24 @@ example in certs/pca-cert.pem . Running B<asn1parse> as follows yields:
126 126
127 openssl asn1parse -in pca-cert.pem 127 openssl asn1parse -in pca-cert.pem
128 128
129 0:d=0 hl=4 l= 742 cons: SEQUENCE 129 0:d=0 hl=4 l= 742 cons: SEQUENCE
130 4:d=1 hl=4 l= 591 cons: SEQUENCE 130 4:d=1 hl=4 l= 591 cons: SEQUENCE
131 8:d=2 hl=2 l= 3 cons: cont [ 0 ] 131 8:d=2 hl=2 l= 3 cons: cont [ 0 ]
132 10:d=3 hl=2 l= 1 prim: INTEGER :02 132 10:d=3 hl=2 l= 1 prim: INTEGER :02
133 13:d=2 hl=2 l= 1 prim: INTEGER :00 133 13:d=2 hl=2 l= 1 prim: INTEGER :00
134 16:d=2 hl=2 l= 13 cons: SEQUENCE 134 16:d=2 hl=2 l= 13 cons: SEQUENCE
135 18:d=3 hl=2 l= 9 prim: OBJECT :md5WithRSAEncryption 135 18:d=3 hl=2 l= 9 prim: OBJECT :md5WithRSAEncryption
136 29:d=3 hl=2 l= 0 prim: NULL 136 29:d=3 hl=2 l= 0 prim: NULL
137 31:d=2 hl=2 l= 92 cons: SEQUENCE 137 31:d=2 hl=2 l= 92 cons: SEQUENCE
138 33:d=3 hl=2 l= 11 cons: SET 138 33:d=3 hl=2 l= 11 cons: SET
139 35:d=4 hl=2 l= 9 cons: SEQUENCE 139 35:d=4 hl=2 l= 9 cons: SEQUENCE
140 37:d=5 hl=2 l= 3 prim: OBJECT :countryName 140 37:d=5 hl=2 l= 3 prim: OBJECT :countryName
141 42:d=5 hl=2 l= 2 prim: PRINTABLESTRING :AU 141 42:d=5 hl=2 l= 2 prim: PRINTABLESTRING :AU
142 .... 142 ....
143 599:d=1 hl=2 l= 13 cons: SEQUENCE 143 599:d=1 hl=2 l= 13 cons: SEQUENCE
144 601:d=2 hl=2 l= 9 prim: OBJECT :md5WithRSAEncryption 144 601:d=2 hl=2 l= 9 prim: OBJECT :md5WithRSAEncryption
145 612:d=2 hl=2 l= 0 prim: NULL 145 612:d=2 hl=2 l= 0 prim: NULL
146 614:d=1 hl=3 l= 129 prim: BIT STRING 146 614:d=1 hl=3 l= 129 prim: BIT STRING
147 147
148 148
149The final BIT STRING contains the actual signature. It can be extracted with: 149The final BIT STRING contains the actual signature. It can be extracted with:
@@ -151,18 +151,18 @@ The final BIT STRING contains the actual signature. It can be extracted with:
151 openssl asn1parse -in pca-cert.pem -out sig -noout -strparse 614 151 openssl asn1parse -in pca-cert.pem -out sig -noout -strparse 614
152 152
153The certificate public key can be extracted with: 153The certificate public key can be extracted with:
154 154
155 openssl x509 -in test/testx509.pem -pubkey -noout >pubkey.pem 155 openssl x509 -in test/testx509.pem -pubkey -noout >pubkey.pem
156 156
157The signature can be analysed with: 157The signature can be analysed with:
158 158
159 openssl rsautl -in sig -verify -asn1parse -inkey pubkey.pem -pubin 159 openssl rsautl -in sig -verify -asn1parse -inkey pubkey.pem -pubin
160 160
161 0:d=0 hl=2 l= 32 cons: SEQUENCE 161 0:d=0 hl=2 l= 32 cons: SEQUENCE
162 2:d=1 hl=2 l= 12 cons: SEQUENCE 162 2:d=1 hl=2 l= 12 cons: SEQUENCE
163 4:d=2 hl=2 l= 8 prim: OBJECT :md5 163 4:d=2 hl=2 l= 8 prim: OBJECT :md5
164 14:d=2 hl=2 l= 0 prim: NULL 164 14:d=2 hl=2 l= 0 prim: NULL
165 16:d=1 hl=2 l= 16 prim: OCTET STRING 165 16:d=1 hl=2 l= 16 prim: OCTET STRING
166 0000 - f3 46 9e aa 1a 4a 73 c9-37 ea 93 00 48 25 08 b5 .F...Js.7...H%.. 166 0000 - f3 46 9e aa 1a 4a 73 c9-37 ea 93 00 48 25 08 b5 .F...Js.7...H%..
167 167
168This is the parsed version of an ASN1 DigestInfo structure. It can be seen that 168This is the parsed version of an ASN1 DigestInfo structure. It can be seen that
diff --git a/src/lib/libssl/src/doc/apps/s_client.pod b/src/lib/libssl/src/doc/apps/s_client.pod
index 445260d91a..5e55c928b9 100644
--- a/src/lib/libssl/src/doc/apps/s_client.pod
+++ b/src/lib/libssl/src/doc/apps/s_client.pod
@@ -217,7 +217,7 @@ print out a hex dump of any TLS extensions received from the server.
217 217
218=item B<-no_ticket> 218=item B<-no_ticket>
219 219
220disable RFC4507bis session ticket support. 220disable RFC4507bis session ticket support.
221 221
222=item B<-sess_out filename> 222=item B<-sess_out filename>
223 223
diff --git a/src/lib/libssl/src/doc/apps/s_server.pod b/src/lib/libssl/src/doc/apps/s_server.pod
index 6758ba3080..b5096cf735 100644
--- a/src/lib/libssl/src/doc/apps/s_server.pod
+++ b/src/lib/libssl/src/doc/apps/s_server.pod
@@ -231,7 +231,7 @@ print out a hex dump of any TLS extensions received from the server.
231 231
232=item B<-no_ticket> 232=item B<-no_ticket>
233 233
234disable RFC4507bis session ticket support. 234disable RFC4507bis session ticket support.
235 235
236=item B<-www> 236=item B<-www>
237 237
@@ -282,7 +282,7 @@ all others.
282 282
283If a connection request is established with an SSL client and neither the 283If a connection request is established with an SSL client and neither the
284B<-www> nor the B<-WWW> option has been used then normally any data received 284B<-www> nor the B<-WWW> option has been used then normally any data received
285from the client is displayed and any key presses will be sent to the client. 285from the client is displayed and any key presses will be sent to the client.
286 286
287Certain single letter commands are also recognized which perform special 287Certain single letter commands are also recognized which perform special
288operations: these are listed below. 288operations: these are listed below.
diff --git a/src/lib/libssl/src/doc/apps/sess_id.pod b/src/lib/libssl/src/doc/apps/sess_id.pod
index 9988d2cd3d..fea70b22e2 100644
--- a/src/lib/libssl/src/doc/apps/sess_id.pod
+++ b/src/lib/libssl/src/doc/apps/sess_id.pod
@@ -35,7 +35,7 @@ format base64 encoded with additional header and footer lines.
35 35
36=item B<-outform DER|PEM> 36=item B<-outform DER|PEM>
37 37
38This specifies the output format, the options have the same meaning as the 38This specifies the output format, the options have the same meaning as the
39B<-inform> option. 39B<-inform> option.
40 40
41=item B<-in filename> 41=item B<-in filename>
@@ -51,7 +51,7 @@ output if this option is not specified.
51=item B<-text> 51=item B<-text>
52 52
53prints out the various public or private key components in 53prints out the various public or private key components in
54plain text in addition to the encoded version. 54plain text in addition to the encoded version.
55 55
56=item B<-cert> 56=item B<-cert>
57 57
diff --git a/src/lib/libssl/src/doc/apps/smime.pod b/src/lib/libssl/src/doc/apps/smime.pod
index e4e89af847..3bc5c4fde1 100644
--- a/src/lib/libssl/src/doc/apps/smime.pod
+++ b/src/lib/libssl/src/doc/apps/smime.pod
@@ -132,7 +132,7 @@ is S/MIME and it uses the multipart/signed MIME content type.
132 132
133this option adds plain text (text/plain) MIME headers to the supplied 133this option adds plain text (text/plain) MIME headers to the supplied
134message if encrypting or signing. If decrypting or verifying it strips 134message if encrypting or signing. If decrypting or verifying it strips
135off text headers: if the decrypted or verified message is not of MIME 135off text headers: if the decrypted or verified message is not of MIME
136type text/plain then an error occurs. 136type text/plain then an error occurs.
137 137
138=item B<-CAfile file> 138=item B<-CAfile file>
@@ -155,7 +155,7 @@ default digest algorithm for the signing key will be used (usually SHA1).
155 155
156the encryption algorithm to use. For example DES (56 bits) - B<-des>, 156the encryption algorithm to use. For example DES (56 bits) - B<-des>,
157triple DES (168 bits) - B<-des3>, 157triple DES (168 bits) - B<-des3>,
158EVP_get_cipherbyname() function) can also be used preceded by a dash, for 158EVP_get_cipherbyname() function) can also be used preceded by a dash, for
159example B<-aes_128_cbc>. See L<B<enc>|enc(1)> for list of ciphers 159example B<-aes_128_cbc>. See L<B<enc>|enc(1)> for list of ciphers
160supported by your version of OpenSSL. 160supported by your version of OpenSSL.
161 161
@@ -250,7 +250,7 @@ all others.
250=item B<cert.pem...> 250=item B<cert.pem...>
251 251
252one or more certificates of message recipients: used when encrypting 252one or more certificates of message recipients: used when encrypting
253a message. 253a message.
254 254
255=item B<-to, -from, -subject> 255=item B<-to, -from, -subject>
256 256
@@ -312,7 +312,7 @@ remains DER.
312 312
313the operation was completely successfully. 313the operation was completely successfully.
314 314
315=item 1 315=item 1
316 316
317an error occurred parsing the command options. 317an error occurred parsing the command options.
318 318
@@ -397,7 +397,7 @@ it with:
397 -----BEGIN PKCS7----- 397 -----BEGIN PKCS7-----
398 -----END PKCS7----- 398 -----END PKCS7-----
399 399
400and using the command: 400and using the command:
401 401
402 openssl smime -verify -inform PEM -in signature.pem -content content.txt 402 openssl smime -verify -inform PEM -in signature.pem -content content.txt
403 403
diff --git a/src/lib/libssl/src/doc/apps/ts.pod b/src/lib/libssl/src/doc/apps/ts.pod
index d6aa47d314..1abf9df566 100644
--- a/src/lib/libssl/src/doc/apps/ts.pod
+++ b/src/lib/libssl/src/doc/apps/ts.pod
@@ -121,7 +121,7 @@ parameter is specified. (Optional)
121It is possible to specify the message imprint explicitly without the data 121It is possible to specify the message imprint explicitly without the data
122file. The imprint must be specified in a hexadecimal format, two characters 122file. The imprint must be specified in a hexadecimal format, two characters
123per byte, the bytes optionally separated by colons (e.g. 1A:F6:01:... or 123per byte, the bytes optionally separated by colons (e.g. 1A:F6:01:... or
1241AF601...). The number of bytes must match the message digest algorithm 1241AF601...). The number of bytes must match the message digest algorithm
125in use. (Optional) 125in use. (Optional)
126 126
127=item B<-md2>|B<-md4>|B<-md5>|B<-sha>|B<-sha1>|B<-mdc2>|B<-ripemd160>|B<...> 127=item B<-md2>|B<-md4>|B<-md5>|B<-sha>|B<-sha1>|B<-mdc2>|B<-ripemd160>|B<...>
@@ -283,7 +283,7 @@ data file. The B<-verify> command does not use the configuration file.
283=item B<-data> file_to_hash 283=item B<-data> file_to_hash
284 284
285The response or token must be verified against file_to_hash. The file 285The response or token must be verified against file_to_hash. The file
286is hashed with the message digest algorithm specified in the token. 286is hashed with the message digest algorithm specified in the token.
287The B<-digest> and B<-queryfile> options must not be specified with this one. 287The B<-digest> and B<-queryfile> options must not be specified with this one.
288(Optional) 288(Optional)
289 289
@@ -318,9 +318,9 @@ details. Either this option or B<-CAfile> must be specified. (Optional)
318 318
319=item B<-CAfile> trusted_certs.pem 319=item B<-CAfile> trusted_certs.pem
320 320
321The name of the file containing a set of trusted self-signed CA 321The name of the file containing a set of trusted self-signed CA
322certificates in PEM format. See the similar option of 322certificates in PEM format. See the similar option of
323L<verify(1)|verify(1)> for additional details. Either this option 323L<verify(1)|verify(1)> for additional details. Either this option
324or B<-CApath> must be specified. 324or B<-CApath> must be specified.
325(Optional) 325(Optional)
326 326
@@ -348,7 +348,7 @@ switch always overrides the settings in the config file.
348 348
349=over 4 349=over 4
350 350
351=item B<tsa> section, B<default_tsa> 351=item B<tsa> section, B<default_tsa>
352 352
353This is the main section and it specifies the name of another section 353This is the main section and it specifies the name of another section
354that contains all the options for the B<-reply> command. This default 354that contains all the options for the B<-reply> command. This default
@@ -375,8 +375,8 @@ generation a new file is created with serial number 1. (Mandatory)
375 375
376=item B<crypto_device> 376=item B<crypto_device>
377 377
378Specifies the OpenSSL engine that will be set as the default for 378Specifies the OpenSSL engine that will be set as the default for
379all available algorithms. The default value is builtin, you can specify 379all available algorithms. The default value is builtin, you can specify
380any other engines supported by OpenSSL (e.g. use chil for the NCipher HSM). 380any other engines supported by OpenSSL (e.g. use chil for the NCipher HSM).
381(Optional) 381(Optional)
382 382
@@ -419,7 +419,7 @@ the components is missing zero is assumed for that field. (Optional)
419 419
420=item B<clock_precision_digits> 420=item B<clock_precision_digits>
421 421
422Specifies the maximum number of digits, which represent the fraction of 422Specifies the maximum number of digits, which represent the fraction of
423seconds, that need to be included in the time field. The trailing zeroes 423seconds, that need to be included in the time field. The trailing zeroes
424must be removed from the time, so there might actually be fewer digits, 424must be removed from the time, so there might actually be fewer digits,
425or no fraction of seconds at all. Supported only on UNIX platforms. 425or no fraction of seconds at all. Supported only on UNIX platforms.
@@ -458,12 +458,12 @@ overridden by the B<-config> command line option.
458=head1 EXAMPLES 458=head1 EXAMPLES
459 459
460All the examples below presume that B<OPENSSL_CONF> is set to a proper 460All the examples below presume that B<OPENSSL_CONF> is set to a proper
461configuration file, e.g. the example configuration file 461configuration file, e.g. the example configuration file
462openssl/apps/openssl.cnf will do. 462openssl/apps/openssl.cnf will do.
463 463
464=head2 Time Stamp Request 464=head2 Time Stamp Request
465 465
466To create a time stamp request for design1.txt with SHA-1 466To create a time stamp request for design1.txt with SHA-1
467without nonce and policy and no certificate is required in the response: 467without nonce and policy and no certificate is required in the response:
468 468
469 openssl ts -query -data design1.txt -no_nonce \ 469 openssl ts -query -data design1.txt -no_nonce \
@@ -479,7 +479,7 @@ To print the content of the previous request in human readable format:
479 479
480 openssl ts -query -in design1.tsq -text 480 openssl ts -query -in design1.tsq -text
481 481
482To create a time stamp request which includes the MD-5 digest 482To create a time stamp request which includes the MD-5 digest
483of design2.txt, requests the signer certificate and nonce, 483of design2.txt, requests the signer certificate and nonce,
484specifies a policy id (assuming the tsa_policy1 name is defined in the 484specifies a policy id (assuming the tsa_policy1 name is defined in the
485OID section of the config file): 485OID section of the config file):
@@ -559,8 +559,8 @@ Zoltan Glozik <zglozik@opentsa.org>. Known issues:
559=over 4 559=over 4
560 560
561=item * No support for time stamps over SMTP, though it is quite easy 561=item * No support for time stamps over SMTP, though it is quite easy
562to implement an automatic e-mail based TSA with L<procmail(1)|procmail(1)> 562to implement an automatic e-mail based TSA with L<procmail(1)|procmail(1)>
563and L<perl(1)|perl(1)>. HTTP server support is provided in the form of 563and L<perl(1)|perl(1)>. HTTP server support is provided in the form of
564a separate apache module. HTTP client support is provided by 564a separate apache module. HTTP client support is provided by
565L<tsget(1)|tsget(1)>. Pure TCP/IP protocol is not supported. 565L<tsget(1)|tsget(1)>. Pure TCP/IP protocol is not supported.
566 566
@@ -587,8 +587,8 @@ Zoltan Glozik <zglozik@opentsa.org>, OpenTSA project (http://www.opentsa.org)
587 587
588=head1 SEE ALSO 588=head1 SEE ALSO
589 589
590L<tsget(1)|tsget(1)>, L<openssl(1)|openssl(1)>, L<req(1)|req(1)>, 590L<tsget(1)|tsget(1)>, L<openssl(1)|openssl(1)>, L<req(1)|req(1)>,
591L<x509(1)|x509(1)>, L<ca(1)|ca(1)>, L<genrsa(1)|genrsa(1)>, 591L<x509(1)|x509(1)>, L<ca(1)|ca(1)>, L<genrsa(1)|genrsa(1)>,
592L<config(5)|config(5)> 592L<config(5)|config(5)>
593 593
594=cut 594=cut
diff --git a/src/lib/libssl/src/doc/apps/verify.pod b/src/lib/libssl/src/doc/apps/verify.pod
index f1d5384b9a..df448ce40d 100644
--- a/src/lib/libssl/src/doc/apps/verify.pod
+++ b/src/lib/libssl/src/doc/apps/verify.pod
@@ -108,7 +108,7 @@ Print out diagnostics related to policy processing.
108=item B<-crl_check> 108=item B<-crl_check>
109 109
110Checks end entity certificate validity by attempting to look up a valid CRL. 110Checks end entity certificate validity by attempting to look up a valid CRL.
111If a valid CRL cannot be found an error occurs. 111If a valid CRL cannot be found an error occurs.
112 112
113=item B<-crl_check_all> 113=item B<-crl_check_all>
114 114
@@ -171,14 +171,14 @@ The verify operation consists of a number of separate steps.
171Firstly a certificate chain is built up starting from the supplied certificate 171Firstly a certificate chain is built up starting from the supplied certificate
172and ending in the root CA. It is an error if the whole chain cannot be built 172and ending in the root CA. It is an error if the whole chain cannot be built
173up. The chain is built up by looking up the issuers certificate of the current 173up. The chain is built up by looking up the issuers certificate of the current
174certificate. If a certificate is found which is its own issuer it is assumed 174certificate. If a certificate is found which is its own issuer it is assumed
175to be the root CA. 175to be the root CA.
176 176
177The process of 'looking up the issuers certificate' itself involves a number 177The process of 'looking up the issuers certificate' itself involves a number
178of steps. In versions of OpenSSL before 0.9.5a the first certificate whose 178of steps. In versions of OpenSSL before 0.9.5a the first certificate whose
179subject name matched the issuer of the current certificate was assumed to be 179subject name matched the issuer of the current certificate was assumed to be
180the issuers certificate. In OpenSSL 0.9.6 and later all certificates 180the issuers certificate. In OpenSSL 0.9.6 and later all certificates
181whose subject name matches the issuer name of the current certificate are 181whose subject name matches the issuer name of the current certificate are
182subject to further tests. The relevant authority key identifier components 182subject to further tests. The relevant authority key identifier components
183of the current certificate (if present) must match the subject key identifier 183of the current certificate (if present) must match the subject key identifier
184(if present) and issuer and serial number of the candidate issuer, in addition 184(if present) and issuer and serial number of the candidate issuer, in addition
@@ -201,7 +201,7 @@ the B<CERTIFICATE EXTENSIONS> section of the B<x509> utility.
201The third operation is to check the trust settings on the root CA. The root 201The third operation is to check the trust settings on the root CA. The root
202CA should be trusted for the supplied purpose. For compatibility with previous 202CA should be trusted for the supplied purpose. For compatibility with previous
203versions of SSLeay and OpenSSL a certificate with no trust settings is considered 203versions of SSLeay and OpenSSL a certificate with no trust settings is considered
204to be valid for all purposes. 204to be valid for all purposes.
205 205
206The final operation is to check the validity of the certificate chain. The validity 206The final operation is to check the validity of the certificate chain. The validity
207period is checked against the current system time and the notBefore and notAfter 207period is checked against the current system time and the notBefore and notAfter
diff --git a/src/lib/libssl/src/doc/apps/x509.pod b/src/lib/libssl/src/doc/apps/x509.pod
index 314018f086..e6ea9cd9d2 100644
--- a/src/lib/libssl/src/doc/apps/x509.pod
+++ b/src/lib/libssl/src/doc/apps/x509.pod
@@ -83,7 +83,7 @@ obsolete.
83 83
84=item B<-outform DER|PEM|NET> 84=item B<-outform DER|PEM|NET>
85 85
86This specifies the output format, the options have the same meaning as the 86This specifies the output format, the options have the same meaning as the
87B<-inform> option. 87B<-inform> option.
88 88
89=item B<-in filename> 89=item B<-in filename>
@@ -300,7 +300,7 @@ can thus behave like a "mini CA".
300=item B<-signkey filename> 300=item B<-signkey filename>
301 301
302this option causes the input file to be self signed using the supplied 302this option causes the input file to be self signed using the supplied
303private key. 303private key.
304 304
305If the input file is a certificate it sets the issuer name to the 305If the input file is a certificate it sets the issuer name to the
306subject name (i.e. makes it self signed) changes the public key to the 306subject name (i.e. makes it self signed) changes the public key to the
@@ -376,7 +376,7 @@ an even number of hex digits with the serial number to use. After each
376use the serial number is incremented and written out to the file again. 376use the serial number is incremented and written out to the file again.
377 377
378The default filename consists of the CA certificate file base name with 378The default filename consists of the CA certificate file base name with
379".srl" appended. For example if the CA certificate file is called 379".srl" appended. For example if the CA certificate file is called
380"mycacert.pem" it expects to find a serial number file called "mycacert.srl". 380"mycacert.pem" it expects to find a serial number file called "mycacert.srl".
381 381
382=item B<-CAcreateserial> 382=item B<-CAcreateserial>
@@ -811,7 +811,7 @@ if the keyUsage extension is present.
811The extended key usage extension must be absent or include the "email 811The extended key usage extension must be absent or include the "email
812protection" OID. Netscape certificate type must be absent or must have the 812protection" OID. Netscape certificate type must be absent or must have the
813S/MIME CA bit set: this is used as a work around if the basicConstraints 813S/MIME CA bit set: this is used as a work around if the basicConstraints
814extension is absent. 814extension is absent.
815 815
816=item B<CRL Signing> 816=item B<CRL Signing>
817 817
@@ -846,7 +846,7 @@ OpenSSL 0.9.5 and later.
846 846
847L<req(1)|req(1)>, L<ca(1)|ca(1)>, L<genrsa(1)|genrsa(1)>, 847L<req(1)|req(1)>, L<ca(1)|ca(1)>, L<genrsa(1)|genrsa(1)>,
848L<gendsa(1)|gendsa(1)>, L<verify(1)|verify(1)>, 848L<gendsa(1)|gendsa(1)>, L<verify(1)|verify(1)>,
849L<x509v3_config(5)|x509v3_config(5)> 849L<x509v3_config(5)|x509v3_config(5)>
850 850
851=head1 HISTORY 851=head1 HISTORY
852 852
diff --git a/src/lib/libssl/src/doc/apps/x509v3_config.pod b/src/lib/libssl/src/doc/apps/x509v3_config.pod
index 0450067cf1..09e1d3a6e3 100644
--- a/src/lib/libssl/src/doc/apps/x509v3_config.pod
+++ b/src/lib/libssl/src/doc/apps/x509v3_config.pod
@@ -202,7 +202,7 @@ Examples:
202The issuer alternative name option supports all the literal options of 202The issuer alternative name option supports all the literal options of
203subject alternative name. It does B<not> support the email:copy option because 203subject alternative name. It does B<not> support the email:copy option because
204that would not make sense. It does support an additional issuer:copy option 204that would not make sense. It does support an additional issuer:copy option
205that will copy all the subject alternative name values from the issuer 205that will copy all the subject alternative name values from the issuer
206certificate (if possible). 206certificate (if possible).
207 207
208Example: 208Example:
@@ -301,7 +301,7 @@ Example:
301 O=Organisation 301 O=Organisation
302 CN=Some Name 302 CN=Some Name
303 303
304 304
305=head2 Certificate Policies. 305=head2 Certificate Policies.
306 306
307This is a I<raw> extension. All the fields of this extension can be set by 307This is a I<raw> extension. All the fields of this extension can be set by
@@ -380,7 +380,7 @@ Example:
380The name constraints extension is a multi-valued extension. The name should 380The name constraints extension is a multi-valued extension. The name should
381begin with the word B<permitted> or B<excluded> followed by a B<;>. The rest of 381begin with the word B<permitted> or B<excluded> followed by a B<;>. The rest of
382the name and the value follows the syntax of subjectAltName except email:copy 382the name and the value follows the syntax of subjectAltName except email:copy
383is not supported and the B<IP> form should consist of an IP addresses and 383is not supported and the B<IP> form should consist of an IP addresses and
384subnet mask separated by a B</>. 384subnet mask separated by a B</>.
385 385
386Examples: 386Examples:
@@ -491,7 +491,7 @@ will produce an error but the equivalent form:
491 [subject_alt_section] 491 [subject_alt_section]
492 subjectAltName=URI:ldap://somehost.com/CN=foo,OU=bar 492 subjectAltName=URI:ldap://somehost.com/CN=foo,OU=bar
493 493
494is valid. 494is valid.
495 495
496Due to the behaviour of the OpenSSL B<conf> library the same field name 496Due to the behaviour of the OpenSSL B<conf> library the same field name
497can only occur once in a section. This means that: 497can only occur once in a section. This means that: