diff options
Diffstat (limited to 'src/lib')
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 | |||
76 | present then the string is obtained from the default section using the name | 76 | present then the string is obtained from the default section using the name |
77 | B<asn1>. The encoded data is passed through the ASN1 parser and printed out as | 77 | B<asn1>. The encoded data is passed through the ASN1 parser and printed out as |
78 | though it came from a file, the contents can thus be examined and written to a | 78 | though it came from a file, the contents can thus be examined and written to a |
79 | file using the B<out> option. | 79 | file 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 | ||
85 | The output will typically contain lines like this: | 85 | The 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 | ||
110 | The B<-i> option can be used to make the output more readable. | 110 | The B<-i> option can be used to make the output more readable. |
111 | 111 | ||
112 | Some knowledge of the ASN.1 structure is needed to interpret the output. | 112 | Some knowledge of the ASN.1 structure is needed to interpret the output. |
113 | 113 | ||
114 | In this example the BIT STRING at offset 229 is the certificate public key. | 114 | In this example the BIT STRING at offset 229 is the certificate public key. |
115 | The contents octets of this will contain the public key information. This can | 115 | The contents octets of this will contain the public key information. This can |
116 | be examined using the option B<-strparse 229> to yield: | 116 | be 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 | ||
124 | If an OID is not part of OpenSSL's internal table it will be represented in | 124 | If an OID is not part of OpenSSL's internal table it will be represented in |
125 | numerical form (for example 1.2.3.4). The file passed to the B<-oid> option | 125 | numerical form (for example 1.2.3.4). The file passed to the B<-oid> option |
126 | allows additional OIDs to be included. Each line consists of three columns, | 126 | allows additional OIDs to be included. Each line consists of three columns, |
127 | the first column is the OID in numerical format and should be followed by white | 127 | the first column is the OID in numerical format and should be followed by white |
128 | space. The second column is the "short name" which is a single word followed | 128 | space. 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 | ||
90 | if present this should be the last option, all subsequent arguments | 90 | if present this should be the last option, all subsequent arguments |
91 | are assumed to the the names of files containing certificate requests. | 91 | are 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 | ||
182 | Normally the DN order of a certificate is the same as the order of the | 182 | Normally the DN order of a certificate is the same as the order of the |
183 | fields in the relevant policy section. When this option is set the order | 183 | fields in the relevant policy section. When this option is set the order |
184 | is the same as the request. This is largely for compatibility with the | 184 | is the same as the request. This is largely for compatibility with the |
185 | older IE enrollment control which would only accept certificates if their | 185 | older IE enrollment control which would only accept certificates if their |
186 | DNs match the order of the request. This is not needed for Xenroll. | 186 | DNs 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 | ||
233 | this option causes field values to be interpreted as UTF8 strings, by | 233 | this option causes field values to be interpreted as UTF8 strings, by |
234 | default they are interpreted as ASCII. This means that the field | 234 | default they are interpreted as ASCII. This means that the field |
235 | values, whether prompted from a terminal or obtained from a | 235 | values, whether prompted from a terminal or obtained from a |
236 | configuration file, must be valid UTF8 strings. | 236 | configuration file, must be valid UTF8 strings. |
@@ -336,7 +336,7 @@ any) used. | |||
336 | This specifies a file containing additional B<OBJECT IDENTIFIERS>. | 336 | This specifies a file containing additional B<OBJECT IDENTIFIERS>. |
337 | Each line of the file should consist of the numerical form of the | 337 | Each line of the file should consist of the numerical form of the |
338 | object identifier followed by white space then the short name followed | 338 | object identifier followed by white space then the short name followed |
339 | by white space and finally the long name. | 339 | by 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 | ||
370 | the same as the B<-days> option. The number of days to certify | 370 | the same as the B<-days> option. The number of days to certify |
371 | a certificate for. | 371 | a 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 | ||
492 | The input to the B<-spkac> command line option is a Netscape | 492 | The input to the B<-spkac> command line option is a Netscape |
493 | signed public key and challenge. This will usually come from | 493 | signed public key and challenge. This will usually come from |
494 | the B<KEYGEN> tag in an HTML form to create a new private key. | 494 | the B<KEYGEN> tag in an HTML form to create a new private key. |
495 | It is however possible to create SPKACs using the B<spkac> utility. | 495 | It is however possible to create SPKACs using the B<spkac> utility. |
496 | 496 | ||
497 | The file should contain the variable SPKAC set to the value of | 497 | The 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 | ||
605 | The text database index file is a critical part of the process and | 605 | The text database index file is a critical part of the process and |
606 | if corrupted it can be difficult to fix. It is theoretically possible | 606 | if corrupted it can be difficult to fix. It is theoretically possible |
607 | to rebuild the index file from all the issued certificates and a current | 607 | to rebuild the index file from all the issued certificates and a current |
608 | CRL: however there is no option to do this. | 608 | CRL: 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 | ||
672 | L<req(1)|req(1)>, L<spkac(1)|spkac(1)>, L<x509(1)|x509(1)>, L<CA.pl(1)|CA.pl(1)>, | 672 | L<req(1)|req(1)>, L<spkac(1)|spkac(1)>, L<x509(1)|x509(1)>, L<CA.pl(1)|CA.pl(1)>, |
673 | L<config(5)|config(5)>, L<x509v3_config(5)|x509v3_config(5)> | 673 | L<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 | ||
252 | cipher suites using SHA1. | 252 | cipher suites using SHA1. |
253 | 253 | ||
254 | =item B<aGOST> | 254 | =item B<aGOST> |
255 | 255 | ||
256 | cipher suites using GOST R 34.10 (either 2001 or 94) for authenticaction | 256 | cipher 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 | ||
146 | Generate and output a signed receipt for the supplied message. The input | 146 | Generate and output a signed receipt for the supplied message. The input |
147 | message B<must> contain a signed receipt request. Functionality is otherwise | 147 | message B<must> contain a signed receipt request. Functionality is otherwise |
148 | similar to the B<-sign> operation. | 148 | similar to the B<-sign> operation. |
149 | 149 | ||
150 | =item B<-verify_receipt receipt> | 150 | =item B<-verify_receipt receipt> |
151 | 151 | ||
152 | Verify a signed receipt in filename B<receipt>. The input message B<must> | 152 | Verify a signed receipt in filename B<receipt>. The input message B<must> |
153 | contain the original receipt request. Functionality is otherwise similar | 153 | contain the original receipt request. Functionality is otherwise similar |
154 | to the B<-verify> operation. | 154 | to the B<-verify> operation. |
155 | 155 | ||
@@ -213,7 +213,7 @@ is S/MIME and it uses the multipart/signed MIME content type. | |||
213 | 213 | ||
214 | this option adds plain text (text/plain) MIME headers to the supplied | 214 | this option adds plain text (text/plain) MIME headers to the supplied |
215 | message if encrypting or signing. If decrypting or verifying it strips | 215 | message if encrypting or signing. If decrypting or verifying it strips |
216 | off text headers: if the decrypted or verified message is not of MIME | 216 | off text headers: if the decrypted or verified message is not of MIME |
217 | type text/plain then an error occurs. | 217 | type 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 | ||
248 | the encryption algorithm to use. For example triple DES (168 bits) - B<-des3> | 248 | the encryption algorithm to use. For example triple DES (168 bits) - B<-des3> |
249 | or 256 bit AES - B<-aes256>. Any standard algorithm name (as used by the | 249 | or 256 bit AES - B<-aes256>. Any standard algorithm name (as used by the |
250 | EVP_get_cipherbyname() function) can also be used preceded by a dash, for | 250 | EVP_get_cipherbyname() function) can also be used preceded by a dash, for |
251 | example B<-aes_128_cbc>. See L<B<enc>|enc(1)> for a list of ciphers | 251 | example B<-aes_128_cbc>. See L<B<enc>|enc(1)> for a list of ciphers |
252 | supported by your version of OpenSSL. | 252 | supported by your version of OpenSSL. |
253 | 253 | ||
254 | If not specified triple DES is used. Only used with B<-encrypt> and | 254 | If not specified triple DES is used. Only used with B<-encrypt> and |
255 | B<-EncryptedData_create> commands. | 255 | B<-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 | ||
341 | Add an explicit email address where signed receipts should be sent to. This | 341 | Add an explicit email address where signed receipts should be sent to. This |
342 | option B<must> but supplied if a signed receipt it requested. | 342 | option 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 | ||
367 | set the encapsulated content type to B<type> if not supplied the B<Data> type | 367 | set the encapsulated content type to B<type> if not supplied the B<Data> type |
368 | is used. The B<type> argument can be any valid OID name in either text or | 368 | is used. The B<type> argument can be any valid OID name in either text or |
369 | numerical format. | 369 | numerical 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 | ||
394 | one or more certificates of message recipients: used when encrypting | 394 | one or more certificates of message recipients: used when encrypting |
395 | a message. | 395 | a 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 | ||
455 | the operation was completely successfully. | 455 | the operation was completely successfully. |
456 | 456 | ||
457 | =item 1 | 457 | =item 1 |
458 | 458 | ||
459 | an error occurred parsing the command options. | 459 | an 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 | ||
560 | and using the command, | 560 | and 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 | |||
63 | unless an option is used in the sub command to use an alternative configuration | 63 | unless an option is used in the sub command to use an alternative configuration |
64 | file. | 64 | file. |
65 | 65 | ||
66 | To enable library configuration the default section needs to contain an | 66 | To enable library configuration the default section needs to contain an |
67 | appropriate line which points to the main configuration section. The default | 67 | appropriate line which points to the main configuration section. The default |
68 | name is B<openssl_conf> which is used by the B<openssl> utility. Other | 68 | name is B<openssl_conf> which is used by the B<openssl> utility. Other |
69 | applications may use an alternative name such as B<myapplicaton_conf>. | 69 | applications may use an alternative name such as B<myapplicaton_conf>. |
70 | 70 | ||
71 | The configuration section should consist of a set of name value pairs which | 71 | The configuration section should consist of a set of name value pairs which |
72 | contain specific module configuration information. The B<name> represents | 72 | contain specific module configuration information. The B<name> represents |
73 | the name of the I<configuration module> the meaning of the B<value> is | 73 | the name of the I<configuration module> the meaning of the B<value> is |
74 | module specific: it may, for example, represent a further configuration | 74 | module specific: it may, for example, represent a further configuration |
75 | section containing configuration module specific information. E.g. | 75 | section 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 | |||
103 | as any compliant applications. For example: | 103 | as 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 | ||
145 | The command B<engine_id> is used to give the ENGINE name. If used this | 145 | The command B<engine_id> is used to give the ENGINE name. If used this |
146 | command must be first. For example: | 146 | command 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 | |||
169 | supply using the functions B<ENGINE_set_default_string()> | 169 | supply using the functions B<ENGINE_set_default_string()> |
170 | 170 | ||
171 | If the name matches none of the above command names it is assumed to be a | 171 | If the name matches none of the above command names it is assumed to be a |
172 | ctrl command which is sent to the ENGINE. The value of the command is the | 172 | ctrl command which is sent to the ENGINE. The value of the command is the |
173 | argument to the ctrl command. If the value is the string B<EMPTY> then no | 173 | argument to the ctrl command. If the value is the string B<EMPTY> then no |
174 | value is sent to the command. | 174 | value is sent to the command. |
175 | 175 | ||
@@ -220,7 +220,7 @@ Here is a sample configuration file using some of the features | |||
220 | mentioned above. | 220 | mentioned 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 | |||
250 | set to any value at all. If you just include the environment variable | 250 | set to any value at all. If you just include the environment variable |
251 | names and the variable doesn't exist then this will cause an error when | 251 | names and the variable doesn't exist then this will cause an error when |
252 | an attempt is made to load the configuration file. By making use of the | 252 | an attempt is made to load the configuration file. By making use of the |
253 | default section both values can be looked up with B<TEMP> taking | 253 | default section both values can be looked up with B<TEMP> taking |
254 | priority and B</tmp> used if neither is defined: | 254 | priority 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 | ||
39 | This specifies the output format, the options have the same meaning as the | 39 | This specifies the output format, the options have the same meaning as the |
40 | B<-inform> option. | 40 | B<-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: | |||
69 | Creates a PKCS#7 structure in DER format with no CRL from several | 69 | Creates a PKCS#7 structure in DER format with no CRL from several |
70 | different certificates: | 70 | different 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 | ||
9 | B<openssl> B<dgst> | 9 | B<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 | ||
121 | Specifies MAC key as alphnumeric string (use if key contain printable | 121 | Specifies MAC key as alphnumeric string (use if key contain printable |
122 | characters only). String length must conform to any restrictions of | 122 | characters only). String length must conform to any restrictions of |
123 | the MAC algorithm for example exactly 32 chars for gost-mac. | 123 | the 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 | |||
136 | generator, or an EGD socket (see L<RAND_egd(3)|RAND_egd(3)>). | 136 | generator, or an EGD socket (see L<RAND_egd(3)|RAND_egd(3)>). |
137 | Multiple files can be specified separated by a OS-dependent character. | 137 | Multiple files can be specified separated by a OS-dependent character. |
138 | The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for | 138 | The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for |
139 | all others. | 139 | all 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 | ||
41 | This specifies the output format, the options have the same meaning as the | 41 | This specifies the output format, the options have the same meaning as the |
42 | B<-inform> option. | 42 | B<-inform> option. |
43 | 43 | ||
44 | =item B<-in> I<filename> | 44 | =item B<-in> I<filename> |
@@ -81,7 +81,7 @@ all others. | |||
81 | 81 | ||
82 | this option specifies that a parameter set should be generated of size | 82 | this option specifies that a parameter set should be generated of size |
83 | I<numbits>. It must be the last option. If not present then a value of 512 | 83 | I<numbits>. It must be the last option. If not present then a value of 512 |
84 | is used. If this option is present then the input file is ignored and | 84 | is used. If this option is present then the input file is ignored and |
85 | parameters are generated instead. | 85 | parameters are generated instead. |
86 | 86 | ||
87 | =item B<-noout> | 87 | =item B<-noout> |
@@ -110,7 +110,7 @@ for all available algorithms. | |||
110 | 110 | ||
111 | The program B<dhparam> combines the functionality of the programs B<dh> and | 111 | The program B<dhparam> combines the functionality of the programs B<dh> and |
112 | B<gendh> in previous versions of OpenSSL and SSLeay. The B<dh> and B<gendh> | 112 | B<gendh> in previous versions of OpenSSL and SSLeay. The B<dh> and B<gendh> |
113 | programs are retained for now but may have different purposes in future | 113 | programs are retained for now but may have different purposes in future |
114 | versions of OpenSSL. | 114 | versions 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 | ||
51 | This specifies the output format, the options have the same meaning as the | 51 | This specifies the output format, the options have the same meaning as the |
52 | B<-inform> option. | 52 | B<-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 | ||
79 | These options encrypt the private key with the DES, triple DES, or the | 79 | These options encrypt the private key with the DES, triple DES, or the |
80 | IDEA ciphers respectively before outputting it. A pass phrase is prompted for. | 80 | IDEA ciphers respectively before outputting it. A pass phrase is prompted for. |
81 | If none of these options is specified the key is written in plain text. This | 81 | If none of these options is specified the key is written in plain text. This |
82 | means that using the B<dsa> utility to read in an encrypted key with no | 82 | means 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 | ||
141 | To convert a private key from PEM to DER format: | 141 | To 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 | ||
39 | This specifies the output format, the options have the same meaning as the | 39 | This specifies the output format, the options have the same meaning as the |
40 | B<-inform> option. | 40 | B<-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 | ||
30 | The B<ec> command processes EC keys. They can be converted between various | 30 | The B<ec> command processes EC keys. They can be converted between various |
31 | forms and their components printed out. B<Note> OpenSSL uses the | 31 | forms and their components printed out. B<Note> OpenSSL uses the |
32 | private key format specified in 'SEC 1: Elliptic Curve Cryptography' | 32 | private 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 |
34 | PKCS#8 private key format use the B<pkcs8> command. | 34 | PKCS#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 | ||
51 | This specifies the output format, the options have the same meaning as the | 51 | This specifies the output format, the options have the same meaning as the |
52 | B<-inform> option. | 52 | B<-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 | ||
79 | These options encrypt the private key with the DES, triple DES, IDEA or | 79 | These options encrypt the private key with the DES, triple DES, IDEA or |
80 | any other cipher supported by OpenSSL before outputting it. A pass phrase is | 80 | any other cipher supported by OpenSSL before outputting it. A pass phrase is |
81 | prompted for. | 81 | prompted for. |
82 | If none of these options is specified the key is written in plain text. This | 82 | If 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. | |||
120 | This specifies how the elliptic curve parameters are encoded. | 120 | This specifies how the elliptic curve parameters are encoded. |
121 | Possible value are: B<named_curve>, i.e. the ec parameters are | 121 | Possible value are: B<named_curve>, i.e. the ec parameters are |
122 | specified by a OID, or B<explicit> where the ec parameters are | 122 | specified by a OID, or B<explicit> where the ec parameters are |
123 | explicitly given (see RFC 3279 for the definition of the | 123 | explicitly given (see RFC 3279 for the definition of the |
124 | EC parameters structures). The default value is B<named_curve>. | 124 | EC parameters structures). The default value is B<named_curve>. |
125 | B<Note> the B<implicitlyCA> alternative ,as specified in RFC 3279, | 125 | B<Note> the B<implicitlyCA> alternative ,as specified in RFC 3279, |
126 | is currently not implemented in OpenSSL. | 126 | is 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 | ||
155 | To convert a private key from PEM to DER format: | 155 | To 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 | ||
37 | This specifies the input format. The B<DER> option uses an ASN.1 DER encoded | 37 | This specifies the input format. The B<DER> option uses an ASN.1 DER encoded |
38 | form compatible with RFC 3279 EcpkParameters. The PEM form is the default | 38 | form compatible with RFC 3279 EcpkParameters. The PEM form is the default |
39 | format: it consists of the B<DER> format base64 encoded with additional | 39 | format: it consists of the B<DER> format base64 encoded with additional |
40 | header and footer lines. | 40 | header and footer lines. |
41 | 41 | ||
42 | =item B<-outform DER|PEM> | 42 | =item B<-outform DER|PEM> |
43 | 43 | ||
44 | This specifies the output format, the options have the same meaning as the | 44 | This specifies the output format, the options have the same meaning as the |
45 | B<-inform> option. | 45 | B<-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. | |||
94 | This specifies how the elliptic curve parameters are encoded. | 94 | This specifies how the elliptic curve parameters are encoded. |
95 | Possible value are: B<named_curve>, i.e. the ec parameters are | 95 | Possible value are: B<named_curve>, i.e. the ec parameters are |
96 | specified by a OID, or B<explicit> where the ec parameters are | 96 | specified by a OID, or B<explicit> where the ec parameters are |
97 | explicitly given (see RFC 3279 for the definition of the | 97 | explicitly given (see RFC 3279 for the definition of the |
98 | EC parameters structures). The default value is B<named_curve>. | 98 | EC parameters structures). The default value is B<named_curve>. |
99 | B<Note> the B<implicitlyCA> alternative ,as specified in RFC 3279, | 99 | B<Note> the B<implicitlyCA> alternative ,as specified in RFC 3279, |
100 | is currently not implemented in OpenSSL. | 100 | is 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 | ||
135 | OpenSSL is currently not able to generate new groups and therefore | 135 | OpenSSL is currently not able to generate new groups and therefore |
136 | B<ecparam> can only create EC parameters from known (named) curves. | 136 | B<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 | ||
103 | do not use a salt | 103 | do 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 | ||
294 | Decode the same file | 294 | Decode 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 | ||
298 | Encrypt a file using triple DES in CBC mode using a prompted password: | 298 | Encrypt 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 | ||
302 | Decrypt a file using a supplied password: | 302 | Decrypt 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 | ||
13 | Sometimes an application will not load error message and only | 13 | Sometimes an application will not load error message and only |
14 | numerical forms will be available. The B<errstr> utility can be used to | 14 | numerical forms will be available. The B<errstr> utility can be used to |
15 | display the meaning of the hex code. The hex code is the hex digits after the | 15 | display the meaning of the hex code. The hex code is the hex digits after the |
16 | second colon. | 16 | second 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 | ||
24 | can be displayed with: | 24 | can be displayed with: |
25 | 25 | ||
26 | openssl errstr 2006D080 | 26 | openssl errstr 2006D080 |
27 | 27 | ||
28 | to produce the error message: | 28 | to 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 | ||
29 | These options encrypt the private key with the DES, triple DES, or the | 29 | These options encrypt the private key with the DES, triple DES, or the |
30 | IDEA ciphers respectively before outputting it. A pass phrase is prompted for. | 30 | IDEA ciphers respectively before outputting it. A pass phrase is prompted for. |
31 | If none of these options is specified no encryption is used. | 31 | If 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 | ||
31 | the output filename. If this argument is not specified then standard output is | 31 | the output filename. If this argument is not specified then standard output is |
32 | used. | 32 | used. |
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 | ||
182 | Generate an RSA private key using default parameters: | 182 | Generate 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 | ||
186 | Encrypt output private key using 128 bit AES and the passphrase "hello": | 186 | Encrypt output private key using 128 bit AES and the passphrase "hello": |
187 | 187 | ||
@@ -199,7 +199,7 @@ Generate 1024 bit DSA parameters: | |||
199 | 199 | ||
200 | Generate DSA key from parameters: | 200 | Generate 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 | ||
204 | Generate 1024 bit DH parameters: | 204 | Generate 1024 bit DH parameters: |
205 | 205 | ||
@@ -208,7 +208,7 @@ Generate 1024 bit DH parameters: | |||
208 | 208 | ||
209 | Generate DH key from parameters: | 209 | Generate 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 | ||
31 | the output filename. If this argument is not specified then standard output is | 31 | the output filename. If this argument is not specified then standard output is |
32 | used. | 32 | used. |
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 | ||
41 | These options encrypt the private key with the DES, triple DES, or the | 41 | These options encrypt the private key with the DES, triple DES, or the |
42 | IDEA ciphers respectively before outputting it. If none of these options is | 42 | IDEA ciphers respectively before outputting it. If none of these options is |
43 | specified no encryption is used. If encryption is used a pass phrase is prompted | 43 | specified no encryption is used. If encryption is used a pass phrase is prompted |
44 | for if it is not supplied via the B<-passout> argument. | 44 | for 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 | ||
212 | this option sets digest algorithm to use for certificate identification | 212 | this option sets digest algorithm to use for certificate identification |
213 | in the OCSP request. By default SHA-1 is used. | 213 | in 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 | ||
266 | The OCSP server will exit after receiving B<number> requests, default unlimited. | 266 | The 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 | ||
270 | Number of minutes or days when fresh revocation information is available: used in the | 270 | Number of minutes or days when fresh revocation information is available: used in the |
271 | B<nextUpdate> field. If neither option is present then the B<nextUpdate> field is | 271 | B<nextUpdate> field. If neither option is present then the B<nextUpdate> field is |
272 | omitted meaning fresh revocation information is immediately available. | 272 | omitted 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 | ||
341 | Send a query to an OCSP responder with URL http://ocsp.myhost.com/ save the | 341 | Send a query to an OCSP responder with URL http://ocsp.myhost.com/ save the |
342 | response to a file and print it out in text form | 342 | response 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 | |||
23 | cryptography standards required by them. | 23 | cryptography standards required by them. |
24 | 24 | ||
25 | The B<openssl> program is a command line tool for using the various | 25 | The B<openssl> program is a command line tool for using the various |
26 | cryptography functions of OpenSSL's B<crypto> library from the shell. | 26 | cryptography functions of OpenSSL's B<crypto> library from the shell. |
27 | It can be used for | 27 | It 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 | ||
78 | Certificate Authority (CA) Management. | 78 | Certificate 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 | ||
107 | Generation and Management of Diffie-Hellman Parameters. Superseded by | 107 | Generation and Management of Diffie-Hellman Parameters. Superseded by |
108 | L<B<genpkey>|genpkey(1)> and L<B<pkeyparam>|pkeyparam(1)> | 108 | L<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 | ||
117 | DSA Parameter Generation and Management. Superseded by | 117 | DSA Parameter Generation and Management. Superseded by |
118 | L<B<genpkey>|genpkey(1)> and L<B<pkeyparam>|pkeyparam(1)> | 118 | L<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 | ||
147 | Generation of DSA Private Key from Parameters. Superseded by | 147 | Generation of DSA Private Key from Parameters. Superseded by |
148 | L<B<genpkey>|genpkey(1)> and L<B<pkey>|pkey(1)> | 148 | L<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 | ||
280 | RMD-160 Digest | 280 | RMD-160 Digest |
281 | 281 | ||
282 | =item B<sha> | 282 | =item B<sha> |
283 | 283 | ||
284 | SHA Digest | 284 | SHA Digest |
285 | 285 | ||
286 | =item B<sha1> | 286 | =item B<sha1> |
287 | 287 | ||
288 | SHA-1 Digest | 288 | SHA-1 Digest |
289 | 289 | ||
@@ -408,7 +408,7 @@ L<rsautl(1)|rsautl(1)>, L<s_client(1)|s_client(1)>, | |||
408 | L<s_server(1)|s_server(1)>, L<s_time(1)|s_time(1)>, | 408 | L<s_server(1)|s_server(1)>, L<s_time(1)|s_time(1)>, |
409 | L<smime(1)|smime(1)>, L<spkac(1)|spkac(1)>, | 409 | L<smime(1)|smime(1)>, L<spkac(1)|spkac(1)>, |
410 | L<verify(1)|verify(1)>, L<version(1)|version(1)>, L<x509(1)|x509(1)>, | 410 | L<verify(1)|verify(1)>, L<version(1)|version(1)>, L<x509(1)|x509(1)>, |
411 | L<crypto(3)|crypto(3)>, L<ssl(3)|ssl(3)>, L<x509v3_config(5)|x509v3_config(5)> | 411 | L<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 | ||
324 | Don't encrypt the private key: | 324 | Don'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 | ||
328 | Print some info about a PKCS#12 file: | 328 | Print 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 | ||
35 | This specifies the output format, the options have the same meaning as the | 35 | This specifies the output format, the options have the same meaning as the |
36 | B<-inform> option. | 36 | B<-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 | ||
96 | There is no option to print out all the fields of a PKCS#7 file. | 96 | There is no option to print out all the fields of a PKCS#7 file. |
97 | 97 | ||
98 | This PKCS#7 routines only understand PKCS#7 v 1.5 as specified in RFC2315 they | 98 | This PKCS#7 routines only understand PKCS#7 v 1.5 as specified in RFC2315 they |
99 | cannot currently parse, for example, the new CMS as described in RFC2630. | 99 | cannot 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 | ||
52 | This specifies the output format, the options have the same meaning as the | 52 | This specifies the output format, the options have the same meaning as the |
53 | B<-inform> option. | 53 | B<-inform> option. |
54 | 54 | ||
55 | =item B<-in filename> | 55 | =item B<-in filename> |
@@ -109,7 +109,7 @@ the public and private keys respectively. | |||
109 | This option enables the use of PKCS#5 v2.0 algorithms. Normally PKCS#8 | 109 | This option enables the use of PKCS#5 v2.0 algorithms. Normally PKCS#8 |
110 | private keys are encrypted with the password based encryption algorithm | 110 | private keys are encrypted with the password based encryption algorithm |
111 | called B<pbeWithMD5AndDES-CBC> this uses 56 bit DES encryption but it | 111 | called B<pbeWithMD5AndDES-CBC> this uses 56 bit DES encryption but it |
112 | was the strongest encryption algorithm supported in PKCS#5 v1.5. Using | 112 | was the strongest encryption algorithm supported in PKCS#5 v1.5. Using |
113 | the B<-v2> option PKCS#5 v2.0 algorithms are used which can use any | 113 | the B<-v2> option PKCS#5 v2.0 algorithms are used which can use any |
114 | encryption algorithm such as 168 bit triple DES or 128 bit RC2 however | 114 | encryption algorithm such as 168 bit triple DES or 128 bit RC2 however |
115 | not many implementations support PKCS#5 v2.0 yet. If you are just using | 115 | not 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 | ||
240 | L<dsa(1)|dsa(1)>, L<rsa(1)|rsa(1)>, L<genrsa(1)|genrsa(1)>, | 240 | L<dsa(1)|dsa(1)>, L<rsa(1)|rsa(1)>, L<genrsa(1)|genrsa(1)>, |
241 | L<gendsa(1)|gendsa(1)> | 241 | L<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 | ||
40 | This specifies the output format, the options have the same meaning as the | 40 | This specifies the output format, the options have the same meaning as the |
41 | B<-inform> option. | 41 | B<-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 | ||
73 | prints out the various public or private key components in | 73 | prints out the various public or private key components in |
74 | plain text in addition to the encoded version. | 74 | plain 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 | ||
114 | To convert a private key from PEM to DER format: | 114 | To 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 | ||
132 | L<genpkey(1)|genpkey(1)>, L<rsa(1)|rsa(1)>, L<pkcs8(1)|pkcs8(1)>, | 132 | L<genpkey(1)|genpkey(1)>, L<rsa(1)|rsa(1)>, L<pkcs8(1)|pkcs8(1)>, |
133 | L<dsa(1)|dsa(1)>, L<genrsa(1)|genrsa(1)>, L<gendsa(1)|gendsa(1)> | 133 | L<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 | ||
38 | prints out the parameters in plain text in addition to the encoded version. | 38 | prints 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 | ||
66 | L<genpkey(1)|genpkey(1)>, L<rsa(1)|rsa(1)>, L<pkcs8(1)|pkcs8(1)>, | 66 | L<genpkey(1)|genpkey(1)>, L<rsa(1)|rsa(1)>, L<pkcs8(1)|pkcs8(1)>, |
67 | L<dsa(1)|dsa(1)>, L<genrsa(1)|genrsa(1)>, L<gendsa(1)|gendsa(1)> | 67 | L<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 | ||
83 | the input file is a public key. | 83 | the input file is a public key. |
84 | 84 | ||
85 | =item B<-certin> | 85 | =item B<-certin> |
86 | 86 | ||
87 | the input is a certificate containing a public key. | 87 | the 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 | ||
143 | The RSA algorithm supports encrypt, decrypt, sign, verify and verifyrecover | 143 | The RSA algorithm supports encrypt, decrypt, sign, verify and verifyrecover |
144 | operations in general. Some padding modes only support some of these | 144 | operations in general. Some padding modes only support some of these |
145 | operations however. | 145 | operations 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 | |||
152 | PKCS#1 padding, B<sslv23> for SSLv23 padding, B<none> for no padding, B<oaep> | 152 | PKCS#1 padding, B<sslv23> for SSLv23 padding, B<none> for no padding, B<oaep> |
153 | for B<OAEP> mode, B<x931> for X9.31 mode and B<pss> for PSS. | 153 | for B<OAEP> mode, B<x931> for X9.31 mode and B<pss> for PSS. |
154 | 154 | ||
155 | In PKCS#1 padding if the message digest is not set then the supplied data is | 155 | In PKCS#1 padding if the message digest is not set then the supplied data is |
156 | signed or verified directly instead of using a B<DigestInfo> structure. If a | 156 | signed or verified directly instead of using a B<DigestInfo> structure. If a |
157 | digest is set then the a B<DigestInfo> structure is used and its the length | 157 | digest is set then the a B<DigestInfo> structure is used and its the length |
158 | must correspond to the digest type. | 158 | must 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 | ||
71 | This specifies the output format, the options have the same meaning as the | 71 | This specifies the output format, the options have the same meaning as the |
72 | B<-inform> option. | 72 | B<-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 | ||
264 | this option causes field values to be interpreted as UTF8 strings, by | 264 | this option causes field values to be interpreted as UTF8 strings, by |
265 | default they are interpreted as ASCII. This means that the field | 265 | default they are interpreted as ASCII. This means that the field |
266 | values, whether prompted from a terminal or obtained from a | 266 | values, whether prompted from a terminal or obtained from a |
267 | configuration file, must be valid UTF8 strings. | 267 | configuration 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 | ||
278 | customise the output format used with B<-text>. The B<option> argument can be | 278 | customise the output format used with B<-text>. The B<option> argument can be |
279 | a single option or multiple options separated by commas. | 279 | a single option or multiple options separated by commas. |
280 | 280 | ||
281 | See discission of the B<-certopt> parameter in the L<B<x509>|x509(1)> | 281 | See discission of the B<-certopt> parameter in the L<B<x509>|x509(1)> |
282 | command. | 282 | command. |
@@ -363,7 +363,7 @@ overridden by the B<-keyout> option. | |||
363 | This specifies a file containing additional B<OBJECT IDENTIFIERS>. | 363 | This specifies a file containing additional B<OBJECT IDENTIFIERS>. |
364 | Each line of the file should consist of the numerical form of the | 364 | Each line of the file should consist of the numerical form of the |
365 | object identifier followed by white space then the short name followed | 365 | object identifier followed by white space then the short name followed |
366 | by white space and finally the long name. | 366 | by 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 | |||
396 | fields. Most users will not need to change this option. | 396 | fields. Most users will not need to change this option. |
397 | 397 | ||
398 | It can be set to several values B<default> which is also the default | 398 | It can be set to several values B<default> which is also the default |
399 | option uses PrintableStrings, T61Strings and BMPStrings if the | 399 | option uses PrintableStrings, T61Strings and BMPStrings if the |
400 | B<pkix> value is used then only PrintableStrings and BMPStrings will | 400 | B<pkix> value is used then only PrintableStrings and BMPStrings will |
401 | be used. This follows the PKIX recommendation in RFC2459. If the | 401 | be used. This follows the PKIX recommendation in RFC2459. If the |
402 | B<utf8only> option is used then only UTF8Strings will be used: this | 402 | B<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 | ||
409 | this specifies the configuration file section containing a list of | 409 | this specifies the configuration file section containing a list of |
410 | extensions to add to the certificate request. It can be overridden | 410 | extensions to add to the certificate request. It can be overridden |
411 | by the B<-reqexts> command line switch. See the | 411 | by the B<-reqexts> command line switch. See the |
412 | L<x509v3_config(5)|x509v3_config(5)> manual page for details of the | 412 | L<x509v3_config(5)|x509v3_config(5)> manual page for details of the |
413 | extension section format. | 413 | extension section format. |
414 | 414 | ||
@@ -673,6 +673,6 @@ address in subjectAltName should be input by the user. | |||
673 | 673 | ||
674 | L<x509(1)|x509(1)>, L<ca(1)|ca(1)>, L<genrsa(1)|genrsa(1)>, | 674 | L<x509(1)|x509(1)>, L<ca(1)|ca(1)>, L<genrsa(1)|genrsa(1)>, |
675 | L<gendsa(1)|gendsa(1)>, L<config(5)|config(5)>, | 675 | L<gendsa(1)|gendsa(1)>, L<config(5)|config(5)>, |
676 | L<x509v3_config(5)|x509v3_config(5)> | 676 | L<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 | ||
54 | This specifies the output format, the options have the same meaning as the | 54 | This specifies the output format, the options have the same meaning as the |
55 | B<-inform> option. | 55 | B<-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 | ||
87 | These options encrypt the private key with the DES, triple DES, or the | 87 | These options encrypt the private key with the DES, triple DES, or the |
88 | IDEA ciphers respectively before outputting it. A pass phrase is prompted for. | 88 | IDEA ciphers respectively before outputting it. A pass phrase is prompted for. |
89 | If none of these options is specified the key is written in plain text. This | 89 | If none of these options is specified the key is written in plain text. This |
90 | means that using the B<rsa> utility to read in an encrypted key with no | 90 | means 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 | ||
97 | prints out the various public or private key components in | 97 | prints out the various public or private key components in |
98 | plain text in addition to the encoded version. | 98 | plain 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 | ||
175 | To convert a private key from PEM to DER format: | 175 | To 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 | ||
201 | L<pkcs8(1)|pkcs8(1)>, L<dsa(1)|dsa(1)>, L<genrsa(1)|genrsa(1)>, | 201 | L<pkcs8(1)|pkcs8(1)>, L<dsa(1)|dsa(1)>, L<genrsa(1)|genrsa(1)>, |
202 | L<gendsa(1)|gendsa(1)> | 202 | L<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 | ||
50 | the input file is an RSA public key. | 50 | the input file is an RSA public key. |
51 | 51 | ||
52 | =item B<-certin> | 52 | =item B<-certin> |
53 | 53 | ||
54 | the input is a certificate containing an RSA public key. | 54 | the 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 | ||
149 | The final BIT STRING contains the actual signature. It can be extracted with: | 149 | The 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 | ||
153 | The certificate public key can be extracted with: | 153 | The 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 | ||
157 | The signature can be analysed with: | 157 | The 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 | ||
168 | This is the parsed version of an ASN1 DigestInfo structure. It can be seen that | 168 | This 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 | ||
220 | disable RFC4507bis session ticket support. | 220 | disable 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 | ||
234 | disable RFC4507bis session ticket support. | 234 | disable RFC4507bis session ticket support. |
235 | 235 | ||
236 | =item B<-www> | 236 | =item B<-www> |
237 | 237 | ||
@@ -282,7 +282,7 @@ all others. | |||
282 | 282 | ||
283 | If a connection request is established with an SSL client and neither the | 283 | If a connection request is established with an SSL client and neither the |
284 | B<-www> nor the B<-WWW> option has been used then normally any data received | 284 | B<-www> nor the B<-WWW> option has been used then normally any data received |
285 | from the client is displayed and any key presses will be sent to the client. | 285 | from the client is displayed and any key presses will be sent to the client. |
286 | 286 | ||
287 | Certain single letter commands are also recognized which perform special | 287 | Certain single letter commands are also recognized which perform special |
288 | operations: these are listed below. | 288 | operations: 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 | ||
38 | This specifies the output format, the options have the same meaning as the | 38 | This specifies the output format, the options have the same meaning as the |
39 | B<-inform> option. | 39 | B<-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 | ||
53 | prints out the various public or private key components in | 53 | prints out the various public or private key components in |
54 | plain text in addition to the encoded version. | 54 | plain 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 | ||
133 | this option adds plain text (text/plain) MIME headers to the supplied | 133 | this option adds plain text (text/plain) MIME headers to the supplied |
134 | message if encrypting or signing. If decrypting or verifying it strips | 134 | message if encrypting or signing. If decrypting or verifying it strips |
135 | off text headers: if the decrypted or verified message is not of MIME | 135 | off text headers: if the decrypted or verified message is not of MIME |
136 | type text/plain then an error occurs. | 136 | type 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 | ||
156 | the encryption algorithm to use. For example DES (56 bits) - B<-des>, | 156 | the encryption algorithm to use. For example DES (56 bits) - B<-des>, |
157 | triple DES (168 bits) - B<-des3>, | 157 | triple DES (168 bits) - B<-des3>, |
158 | EVP_get_cipherbyname() function) can also be used preceded by a dash, for | 158 | EVP_get_cipherbyname() function) can also be used preceded by a dash, for |
159 | example B<-aes_128_cbc>. See L<B<enc>|enc(1)> for list of ciphers | 159 | example B<-aes_128_cbc>. See L<B<enc>|enc(1)> for list of ciphers |
160 | supported by your version of OpenSSL. | 160 | supported 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 | ||
252 | one or more certificates of message recipients: used when encrypting | 252 | one or more certificates of message recipients: used when encrypting |
253 | a message. | 253 | a 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 | ||
313 | the operation was completely successfully. | 313 | the operation was completely successfully. |
314 | 314 | ||
315 | =item 1 | 315 | =item 1 |
316 | 316 | ||
317 | an error occurred parsing the command options. | 317 | an 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 | ||
400 | and using the command: | 400 | and 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) | |||
121 | It is possible to specify the message imprint explicitly without the data | 121 | It is possible to specify the message imprint explicitly without the data |
122 | file. The imprint must be specified in a hexadecimal format, two characters | 122 | file. The imprint must be specified in a hexadecimal format, two characters |
123 | per byte, the bytes optionally separated by colons (e.g. 1A:F6:01:... or | 123 | per byte, the bytes optionally separated by colons (e.g. 1A:F6:01:... or |
124 | 1AF601...). The number of bytes must match the message digest algorithm | 124 | 1AF601...). The number of bytes must match the message digest algorithm |
125 | in use. (Optional) | 125 | in 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 | ||
285 | The response or token must be verified against file_to_hash. The file | 285 | The response or token must be verified against file_to_hash. The file |
286 | is hashed with the message digest algorithm specified in the token. | 286 | is hashed with the message digest algorithm specified in the token. |
287 | The B<-digest> and B<-queryfile> options must not be specified with this one. | 287 | The 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 | ||
321 | The name of the file containing a set of trusted self-signed CA | 321 | The name of the file containing a set of trusted self-signed CA |
322 | certificates in PEM format. See the similar option of | 322 | certificates in PEM format. See the similar option of |
323 | L<verify(1)|verify(1)> for additional details. Either this option | 323 | L<verify(1)|verify(1)> for additional details. Either this option |
324 | or B<-CApath> must be specified. | 324 | or 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 | ||
353 | This is the main section and it specifies the name of another section | 353 | This is the main section and it specifies the name of another section |
354 | that contains all the options for the B<-reply> command. This default | 354 | that 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 | ||
378 | Specifies the OpenSSL engine that will be set as the default for | 378 | Specifies the OpenSSL engine that will be set as the default for |
379 | all available algorithms. The default value is builtin, you can specify | 379 | all available algorithms. The default value is builtin, you can specify |
380 | any other engines supported by OpenSSL (e.g. use chil for the NCipher HSM). | 380 | any 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 | ||
422 | Specifies the maximum number of digits, which represent the fraction of | 422 | Specifies the maximum number of digits, which represent the fraction of |
423 | seconds, that need to be included in the time field. The trailing zeroes | 423 | seconds, that need to be included in the time field. The trailing zeroes |
424 | must be removed from the time, so there might actually be fewer digits, | 424 | must be removed from the time, so there might actually be fewer digits, |
425 | or no fraction of seconds at all. Supported only on UNIX platforms. | 425 | or 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 | ||
460 | All the examples below presume that B<OPENSSL_CONF> is set to a proper | 460 | All the examples below presume that B<OPENSSL_CONF> is set to a proper |
461 | configuration file, e.g. the example configuration file | 461 | configuration file, e.g. the example configuration file |
462 | openssl/apps/openssl.cnf will do. | 462 | openssl/apps/openssl.cnf will do. |
463 | 463 | ||
464 | =head2 Time Stamp Request | 464 | =head2 Time Stamp Request |
465 | 465 | ||
466 | To create a time stamp request for design1.txt with SHA-1 | 466 | To create a time stamp request for design1.txt with SHA-1 |
467 | without nonce and policy and no certificate is required in the response: | 467 | without 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 | ||
482 | To create a time stamp request which includes the MD-5 digest | 482 | To create a time stamp request which includes the MD-5 digest |
483 | of design2.txt, requests the signer certificate and nonce, | 483 | of design2.txt, requests the signer certificate and nonce, |
484 | specifies a policy id (assuming the tsa_policy1 name is defined in the | 484 | specifies a policy id (assuming the tsa_policy1 name is defined in the |
485 | OID section of the config file): | 485 | OID 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 |
562 | to implement an automatic e-mail based TSA with L<procmail(1)|procmail(1)> | 562 | to implement an automatic e-mail based TSA with L<procmail(1)|procmail(1)> |
563 | and L<perl(1)|perl(1)>. HTTP server support is provided in the form of | 563 | and L<perl(1)|perl(1)>. HTTP server support is provided in the form of |
564 | a separate apache module. HTTP client support is provided by | 564 | a separate apache module. HTTP client support is provided by |
565 | L<tsget(1)|tsget(1)>. Pure TCP/IP protocol is not supported. | 565 | L<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 | ||
590 | L<tsget(1)|tsget(1)>, L<openssl(1)|openssl(1)>, L<req(1)|req(1)>, | 590 | L<tsget(1)|tsget(1)>, L<openssl(1)|openssl(1)>, L<req(1)|req(1)>, |
591 | L<x509(1)|x509(1)>, L<ca(1)|ca(1)>, L<genrsa(1)|genrsa(1)>, | 591 | L<x509(1)|x509(1)>, L<ca(1)|ca(1)>, L<genrsa(1)|genrsa(1)>, |
592 | L<config(5)|config(5)> | 592 | L<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 | ||
110 | Checks end entity certificate validity by attempting to look up a valid CRL. | 110 | Checks end entity certificate validity by attempting to look up a valid CRL. |
111 | If a valid CRL cannot be found an error occurs. | 111 | If 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. | |||
171 | Firstly a certificate chain is built up starting from the supplied certificate | 171 | Firstly a certificate chain is built up starting from the supplied certificate |
172 | and ending in the root CA. It is an error if the whole chain cannot be built | 172 | and ending in the root CA. It is an error if the whole chain cannot be built |
173 | up. The chain is built up by looking up the issuers certificate of the current | 173 | up. The chain is built up by looking up the issuers certificate of the current |
174 | certificate. If a certificate is found which is its own issuer it is assumed | 174 | certificate. If a certificate is found which is its own issuer it is assumed |
175 | to be the root CA. | 175 | to be the root CA. |
176 | 176 | ||
177 | The process of 'looking up the issuers certificate' itself involves a number | 177 | The process of 'looking up the issuers certificate' itself involves a number |
178 | of steps. In versions of OpenSSL before 0.9.5a the first certificate whose | 178 | of steps. In versions of OpenSSL before 0.9.5a the first certificate whose |
179 | subject name matched the issuer of the current certificate was assumed to be | 179 | subject name matched the issuer of the current certificate was assumed to be |
180 | the issuers certificate. In OpenSSL 0.9.6 and later all certificates | 180 | the issuers certificate. In OpenSSL 0.9.6 and later all certificates |
181 | whose subject name matches the issuer name of the current certificate are | 181 | whose subject name matches the issuer name of the current certificate are |
182 | subject to further tests. The relevant authority key identifier components | 182 | subject to further tests. The relevant authority key identifier components |
183 | of the current certificate (if present) must match the subject key identifier | 183 | of 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. | |||
201 | The third operation is to check the trust settings on the root CA. The root | 201 | The third operation is to check the trust settings on the root CA. The root |
202 | CA should be trusted for the supplied purpose. For compatibility with previous | 202 | CA should be trusted for the supplied purpose. For compatibility with previous |
203 | versions of SSLeay and OpenSSL a certificate with no trust settings is considered | 203 | versions of SSLeay and OpenSSL a certificate with no trust settings is considered |
204 | to be valid for all purposes. | 204 | to be valid for all purposes. |
205 | 205 | ||
206 | The final operation is to check the validity of the certificate chain. The validity | 206 | The final operation is to check the validity of the certificate chain. The validity |
207 | period is checked against the current system time and the notBefore and notAfter | 207 | period 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 | ||
86 | This specifies the output format, the options have the same meaning as the | 86 | This specifies the output format, the options have the same meaning as the |
87 | B<-inform> option. | 87 | B<-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 | ||
302 | this option causes the input file to be self signed using the supplied | 302 | this option causes the input file to be self signed using the supplied |
303 | private key. | 303 | private key. |
304 | 304 | ||
305 | If the input file is a certificate it sets the issuer name to the | 305 | If the input file is a certificate it sets the issuer name to the |
306 | subject name (i.e. makes it self signed) changes the public key to the | 306 | subject 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 | |||
376 | use the serial number is incremented and written out to the file again. | 376 | use the serial number is incremented and written out to the file again. |
377 | 377 | ||
378 | The default filename consists of the CA certificate file base name with | 378 | The 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. | |||
811 | The extended key usage extension must be absent or include the "email | 811 | The extended key usage extension must be absent or include the "email |
812 | protection" OID. Netscape certificate type must be absent or must have the | 812 | protection" OID. Netscape certificate type must be absent or must have the |
813 | S/MIME CA bit set: this is used as a work around if the basicConstraints | 813 | S/MIME CA bit set: this is used as a work around if the basicConstraints |
814 | extension is absent. | 814 | extension 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 | ||
847 | L<req(1)|req(1)>, L<ca(1)|ca(1)>, L<genrsa(1)|genrsa(1)>, | 847 | L<req(1)|req(1)>, L<ca(1)|ca(1)>, L<genrsa(1)|genrsa(1)>, |
848 | L<gendsa(1)|gendsa(1)>, L<verify(1)|verify(1)>, | 848 | L<gendsa(1)|gendsa(1)>, L<verify(1)|verify(1)>, |
849 | L<x509v3_config(5)|x509v3_config(5)> | 849 | L<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: | |||
202 | The issuer alternative name option supports all the literal options of | 202 | The issuer alternative name option supports all the literal options of |
203 | subject alternative name. It does B<not> support the email:copy option because | 203 | subject alternative name. It does B<not> support the email:copy option because |
204 | that would not make sense. It does support an additional issuer:copy option | 204 | that would not make sense. It does support an additional issuer:copy option |
205 | that will copy all the subject alternative name values from the issuer | 205 | that will copy all the subject alternative name values from the issuer |
206 | certificate (if possible). | 206 | certificate (if possible). |
207 | 207 | ||
208 | Example: | 208 | Example: |
@@ -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 | ||
307 | This is a I<raw> extension. All the fields of this extension can be set by | 307 | This is a I<raw> extension. All the fields of this extension can be set by |
@@ -380,7 +380,7 @@ Example: | |||
380 | The name constraints extension is a multi-valued extension. The name should | 380 | The name constraints extension is a multi-valued extension. The name should |
381 | begin with the word B<permitted> or B<excluded> followed by a B<;>. The rest of | 381 | begin with the word B<permitted> or B<excluded> followed by a B<;>. The rest of |
382 | the name and the value follows the syntax of subjectAltName except email:copy | 382 | the name and the value follows the syntax of subjectAltName except email:copy |
383 | is not supported and the B<IP> form should consist of an IP addresses and | 383 | is not supported and the B<IP> form should consist of an IP addresses and |
384 | subnet mask separated by a B</>. | 384 | subnet mask separated by a B</>. |
385 | 385 | ||
386 | Examples: | 386 | Examples: |
@@ -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 | ||
494 | is valid. | 494 | is valid. |
495 | 495 | ||
496 | Due to the behaviour of the OpenSSL B<conf> library the same field name | 496 | Due to the behaviour of the OpenSSL B<conf> library the same field name |
497 | can only occur once in a section. This means that: | 497 | can only occur once in a section. This means that: |