From: jim Date: Sun, 4 May 2014 20:31:33 +0000 (+0000) Subject: Remove trailing whitespace. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=917088f6278da1b84644d94b033be86506ccea9d;p=openbsd Remove trailing whitespace. no objection jmc@ --- diff --git a/lib/libssl/src/doc/apps/asn1parse.pod b/lib/libssl/src/doc/apps/asn1parse.pod index f7bb9262116..18f5de12120 100644 --- a/lib/libssl/src/doc/apps/asn1parse.pod +++ b/lib/libssl/src/doc/apps/asn1parse.pod @@ -76,7 +76,7 @@ L format. If B only is present then the string is obtained from the default section using the name B. The encoded data is passed through the ASN1 parser and printed out as though it came from a file, the contents can thus be examined and written to a -file using the B option. +file using the B option. =back @@ -84,20 +84,20 @@ file using the B option. The output will typically contain lines like this: - 0:d=0 hl=4 l= 681 cons: SEQUENCE + 0:d=0 hl=4 l= 681 cons: SEQUENCE ..... - 229:d=3 hl=3 l= 141 prim: BIT STRING - 373:d=2 hl=3 l= 162 cons: cont [ 3 ] - 376:d=3 hl=3 l= 159 cons: SEQUENCE - 379:d=4 hl=2 l= 29 cons: SEQUENCE + 229:d=3 hl=3 l= 141 prim: BIT STRING + 373:d=2 hl=3 l= 162 cons: cont [ 3 ] + 376:d=3 hl=3 l= 159 cons: SEQUENCE + 379:d=4 hl=2 l= 29 cons: SEQUENCE 381:d=5 hl=2 l= 3 prim: OBJECT :X509v3 Subject Key Identifier - 386:d=5 hl=2 l= 22 prim: OCTET STRING - 410:d=4 hl=2 l= 112 cons: SEQUENCE + 386:d=5 hl=2 l= 22 prim: OCTET STRING + 410:d=4 hl=2 l= 112 cons: SEQUENCE 412:d=5 hl=2 l= 3 prim: OBJECT :X509v3 Authority Key Identifier - 417:d=5 hl=2 l= 105 prim: OCTET STRING - 524:d=4 hl=2 l= 12 cons: SEQUENCE + 417:d=5 hl=2 l= 105 prim: OCTET STRING + 524:d=4 hl=2 l= 12 cons: SEQUENCE ..... @@ -109,20 +109,20 @@ the contents octets. The B<-i> option can be used to make the output more readable. -Some knowledge of the ASN.1 structure is needed to interpret the output. +Some knowledge of the ASN.1 structure is needed to interpret the output. In this example the BIT STRING at offset 229 is the certificate public key. The contents octets of this will contain the public key information. This can be examined using the option B<-strparse 229> to yield: - 0:d=0 hl=3 l= 137 cons: SEQUENCE + 0:d=0 hl=3 l= 137 cons: SEQUENCE 3:d=1 hl=3 l= 129 prim: INTEGER :E5D21E1F5C8D208EA7A2166C7FAF9F6BDF2059669C60876DDB70840F1A5AAFA59699FE471F379F1DD6A487E7D5409AB6A88D4A9746E24B91D8CF55DB3521015460C8EDE44EE8A4189F7A7BE77D6CD3A9AF2696F486855CF58BF0EDF2B4068058C7A947F52548DDF7E15E96B385F86422BEA9064A3EE9E1158A56E4A6F47E5897 135:d=1 hl=2 l= 3 prim: INTEGER :010001 =head1 NOTES If an OID is not part of OpenSSL's internal table it will be represented in -numerical form (for example 1.2.3.4). The file passed to the B<-oid> option +numerical form (for example 1.2.3.4). The file passed to the B<-oid> option allows additional OIDs to be included. Each line consists of three columns, the first column is the OID in numerical format and should be followed by white space. The second column is the "short name" which is a single word followed diff --git a/lib/libssl/src/doc/apps/ca.pod b/lib/libssl/src/doc/apps/ca.pod index 9ff0cc36125..7294627d163 100644 --- a/lib/libssl/src/doc/apps/ca.pod +++ b/lib/libssl/src/doc/apps/ca.pod @@ -88,7 +88,7 @@ section for information on the required format. =item B<-infiles> if present this should be the last option, all subsequent arguments -are assumed to the the names of files containing certificate requests. +are assumed to the the names of files containing certificate requests. =item B<-out filename> @@ -180,7 +180,7 @@ need this option. =item B<-preserveDN> Normally the DN order of a certificate is the same as the order of the -fields in the relevant policy section. When this option is set the order +fields in the relevant policy section. When this option is set the order is the same as the request. This is largely for compatibility with the older IE enrollment control which would only accept certificates if their 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. =item B<-utf8> -this option causes field values to be interpreted as UTF8 strings, by +this option causes field values to be interpreted as UTF8 strings, by default they are interpreted as ASCII. This means that the field values, whether prompted from a terminal or obtained from a configuration file, must be valid UTF8 strings. @@ -336,7 +336,7 @@ any) used. This specifies a file containing additional B. Each line of the file should consist of the numerical form of the object identifier followed by white space then the short name followed -by white space and finally the long name. +by white space and finally the long name. =item B @@ -368,7 +368,7 @@ an EGD socket (see L). =item B the same as the B<-days> option. The number of days to certify -a certificate for. +a certificate for. =item B @@ -491,7 +491,7 @@ this can be regarded more of a quirk than intended behaviour. The input to the B<-spkac> command line option is a Netscape signed public key and challenge. This will usually come from -the B tag in an HTML form to create a new private key. +the B tag in an HTML form to create a new private key. It is however possible to create SPKACs using the B utility. 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 ] default_ca = CA_default # The default ca section - + [ CA_default ] dir = ./demoCA # top dir database = $dir/index.txt # index file. new_certs_dir = $dir/newcerts # new certs dir - + certificate = $dir/cacert.pem # The CA cert serial = $dir/serial # serial no file private_key = $dir/private/cakey.pem# CA private key RANDFILE = $dir/private/.rand # random number file - + default_days = 365 # how long to certify for default_crl_days= 30 # how long before next CRL default_md = md5 # md to use @@ -602,7 +602,7 @@ be overridden by the B<-config> command line option. =head1 RESTRICTIONS -The text database index file is a critical part of the process and +The text database index file is a critical part of the process and if corrupted it can be difficult to fix. It is theoretically possible to rebuild the index file from all the issued certificates and a current 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. =head1 SEE ALSO L, L, L, L, -L, L +L, L =cut diff --git a/lib/libssl/src/doc/apps/ciphers.pod b/lib/libssl/src/doc/apps/ciphers.pod index f44aa00a2fd..757e0221b7b 100644 --- a/lib/libssl/src/doc/apps/ciphers.pod +++ b/lib/libssl/src/doc/apps/ciphers.pod @@ -251,10 +251,10 @@ cipher suites using MD5. cipher suites using SHA1. -=item B +=item B cipher suites using GOST R 34.10 (either 2001 or 94) for authenticaction -(needs an engine supporting GOST algorithms). +(needs an engine supporting GOST algorithms). =item B diff --git a/lib/libssl/src/doc/apps/cms.pod b/lib/libssl/src/doc/apps/cms.pod index a09588a18df..f32f5c71fa8 100644 --- a/lib/libssl/src/doc/apps/cms.pod +++ b/lib/libssl/src/doc/apps/cms.pod @@ -143,13 +143,13 @@ B type and output the content. =item B<-sign_receipt> -Generate and output a signed receipt for the supplied message. The input +Generate and output a signed receipt for the supplied message. The input message B contain a signed receipt request. Functionality is otherwise similar to the B<-sign> operation. =item B<-verify_receipt receipt> -Verify a signed receipt in filename B. The input message B +Verify a signed receipt in filename B. The input message B contain the original receipt request. Functionality is otherwise similar to the B<-verify> operation. @@ -213,7 +213,7 @@ is S/MIME and it uses the multipart/signed MIME content type. this option adds plain text (text/plain) MIME headers to the supplied message if encrypting or signing. If decrypting or verifying it strips -off text headers: if the decrypted or verified message is not of MIME +off text headers: if the decrypted or verified message is not of MIME type text/plain then an error occurs. =item B<-noout> @@ -247,11 +247,11 @@ default digest algorithm for the signing key will be used (usually SHA1). the encryption algorithm to use. For example triple DES (168 bits) - B<-des3> or 256 bit AES - B<-aes256>. Any standard algorithm name (as used by the -EVP_get_cipherbyname() function) can also be used preceded by a dash, for +EVP_get_cipherbyname() function) can also be used preceded by a dash, for example B<-aes_128_cbc>. See L|enc(1)> for a list of ciphers supported by your version of OpenSSL. -If not specified triple DES is used. Only used with B<-encrypt> and +If not specified triple DES is used. Only used with B<-encrypt> and B<-EncryptedData_create> commands. =item B<-nointern> @@ -338,7 +338,7 @@ address where receipts should be supplied. =item B<-receipt_request_to emailaddress> -Add an explicit email address where signed receipts should be sent to. This +Add an explicit email address where signed receipts should be sent to. This option B but supplied if a signed receipt it requested. =item B<-receipt_request_print> @@ -366,7 +366,7 @@ B structures. set the encapsulated content type to B if not supplied the B type is used. The B argument can be any valid OID name in either text or -numerical format. +numerical format. =item B<-inkey file> @@ -392,7 +392,7 @@ all others. =item B one or more certificates of message recipients: used when encrypting -a message. +a message. =item B<-to, -from, -subject> @@ -454,7 +454,7 @@ remains DER. the operation was completely successfully. -=item 1 +=item 1 an error occurred parsing the command options. @@ -557,7 +557,7 @@ it with: -----BEGIN PKCS7----- -----END PKCS7----- -and using the command, +and using the command, openssl cms -verify -inform PEM -in signature.pem -content content.txt diff --git a/lib/libssl/src/doc/apps/config.pod b/lib/libssl/src/doc/apps/config.pod index 25c5381b9d6..d018dfce502 100644 --- a/lib/libssl/src/doc/apps/config.pod +++ b/lib/libssl/src/doc/apps/config.pod @@ -63,14 +63,14 @@ functionality: any sub command uses the master OpenSSL configuration file unless an option is used in the sub command to use an alternative configuration file. -To enable library configuration the default section needs to contain an +To enable library configuration the default section needs to contain an appropriate line which points to the main configuration section. The default name is B which is used by the B utility. Other applications may use an alternative name such as B. The configuration section should consist of a set of name value pairs which contain specific module configuration information. The B represents -the name of the I the meaning of the B is +the name of the I the meaning of the B is module specific: it may, for example, represent a further configuration section containing configuration module specific information. E.g. @@ -103,7 +103,7 @@ B the B utility sub commands can see the new objects as well as any compliant applications. For example: [new_oids] - + some_new_oid = 1.2.3.4 some_other_oid = 1.2.3.5 @@ -142,7 +142,7 @@ For example: [bar_section] ... "bar" ENGINE specific commands ... -The command B is used to give the ENGINE name. If used this +The command B is used to give the ENGINE name. If used this command must be first. For example: [engine_section] @@ -169,7 +169,7 @@ The command B sets the default algorithms an ENGINE will supply using the functions B If the name matches none of the above command names it is assumed to be a -ctrl command which is sent to the ENGINE. The value of the command is the +ctrl command which is sent to the ENGINE. The value of the command is the argument to the ctrl command. If the value is the string B then no value is sent to the command. @@ -220,7 +220,7 @@ Here is a sample configuration file using some of the features mentioned above. # This is the default section. - + HOME=/temp RANDFILE= ${ENV::HOME}/.rnd configdir=$ENV::HOME/config @@ -250,7 +250,7 @@ the the B or B environment variables but they may not be set to any value at all. If you just include the environment variable names and the variable doesn't exist then this will cause an error when an attempt is made to load the configuration file. By making use of the -default section both values can be looked up with B taking +default section both values can be looked up with B taking priority and B used if neither is defined: TMP=/tmp diff --git a/lib/libssl/src/doc/apps/crl.pod b/lib/libssl/src/doc/apps/crl.pod index 1ad76a5f8c1..f0374282099 100644 --- a/lib/libssl/src/doc/apps/crl.pod +++ b/lib/libssl/src/doc/apps/crl.pod @@ -36,7 +36,7 @@ the DER form with header and footer lines. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the +This specifies the output format, the options have the same meaning as the B<-inform> option. =item B<-in filename> diff --git a/lib/libssl/src/doc/apps/crl2pkcs7.pod b/lib/libssl/src/doc/apps/crl2pkcs7.pod index 3797bc0df4e..37bd03e3165 100644 --- a/lib/libssl/src/doc/apps/crl2pkcs7.pod +++ b/lib/libssl/src/doc/apps/crl2pkcs7.pod @@ -69,7 +69,7 @@ Create a PKCS#7 structure from a certificate and CRL: Creates a PKCS#7 structure in DER format with no CRL from several different certificates: - openssl crl2pkcs7 -nocrl -certfile newcert.pem + openssl crl2pkcs7 -nocrl -certfile newcert.pem -certfile demoCA/cacert.pem -outform DER -out p7.der =head1 NOTES diff --git a/lib/libssl/src/doc/apps/dgst.pod b/lib/libssl/src/doc/apps/dgst.pod index b035edf08e0..da690472a3a 100644 --- a/lib/libssl/src/doc/apps/dgst.pod +++ b/lib/libssl/src/doc/apps/dgst.pod @@ -6,7 +6,7 @@ dgst, md5, md4, md2, sha1, sha, mdc2, ripemd160 - message digests =head1 SYNOPSIS -B B +B B [B<-md5|-md4|-md2|-sha1|-sha|-mdc2|-ripemd160|-dss1>] [B<-c>] [B<-d>] @@ -117,7 +117,7 @@ Following options are supported by both by B and B: =over 8 =item B - + Specifies MAC key as alphnumeric string (use if key contain printable characters only). String length must conform to any restrictions of 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 generator, or an EGD socket (see L). Multiple files can be specified separated by a OS-dependent character. The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for -all others. +all others. =item B diff --git a/lib/libssl/src/doc/apps/dhparam.pod b/lib/libssl/src/doc/apps/dhparam.pod index 9edb4ff4e1d..9ca63b7625a 100644 --- a/lib/libssl/src/doc/apps/dhparam.pod +++ b/lib/libssl/src/doc/apps/dhparam.pod @@ -38,7 +38,7 @@ additional header and footer lines. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the +This specifies the output format, the options have the same meaning as the B<-inform> option. =item B<-in> I @@ -81,7 +81,7 @@ all others. this option specifies that a parameter set should be generated of size I. It must be the last option. If not present then a value of 512 -is used. If this option is present then the input file is ignored and +is used. If this option is present then the input file is ignored and parameters are generated instead. =item B<-noout> @@ -110,7 +110,7 @@ for all available algorithms. The program B combines the functionality of the programs B and B in previous versions of OpenSSL and SSLeay. The B and B -programs are retained for now but may have different purposes in future +programs are retained for now but may have different purposes in future versions of OpenSSL. =head1 NOTES diff --git a/lib/libssl/src/doc/apps/dsa.pod b/lib/libssl/src/doc/apps/dsa.pod index ddbc9327fab..d3edad0a4ac 100644 --- a/lib/libssl/src/doc/apps/dsa.pod +++ b/lib/libssl/src/doc/apps/dsa.pod @@ -48,7 +48,7 @@ PKCS#8 format is also accepted. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the +This specifies the output format, the options have the same meaning as the B<-inform> option. =item B<-in filename> @@ -76,7 +76,7 @@ see the B section in L. =item B<-des|-des3|-idea> -These options encrypt the private key with the DES, triple DES, or the +These options encrypt the private key with the DES, triple DES, or the IDEA ciphers respectively before outputting it. A pass phrase is prompted for. If none of these options is specified the key is written in plain text. This means that using the B utility to read in an encrypted key with no @@ -138,7 +138,7 @@ To encrypt a private key using triple DES: openssl dsa -in key.pem -des3 -out keyout.pem -To convert a private key from PEM to DER format: +To convert a private key from PEM to DER format: openssl dsa -in key.pem -outform DER -out keyout.der diff --git a/lib/libssl/src/doc/apps/dsaparam.pod b/lib/libssl/src/doc/apps/dsaparam.pod index ba5ec4d72cd..cb067bbd173 100644 --- a/lib/libssl/src/doc/apps/dsaparam.pod +++ b/lib/libssl/src/doc/apps/dsaparam.pod @@ -36,7 +36,7 @@ of the B format base64 encoded with additional header and footer lines. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the +This specifies the output format, the options have the same meaning as the B<-inform> option. =item B<-in filename> diff --git a/lib/libssl/src/doc/apps/ec.pod b/lib/libssl/src/doc/apps/ec.pod index 95190a9a2e7..a1b2024d3b5 100644 --- a/lib/libssl/src/doc/apps/ec.pod +++ b/lib/libssl/src/doc/apps/ec.pod @@ -28,7 +28,7 @@ B B =head1 DESCRIPTION The B command processes EC keys. They can be converted between various -forms and their components printed out. B OpenSSL uses the +forms and their components printed out. B OpenSSL uses the private key format specified in 'SEC 1: Elliptic Curve Cryptography' (http://www.secg.org/). To convert a OpenSSL EC private key into the PKCS#8 private key format use the B command. @@ -48,7 +48,7 @@ PKCS#8 format is also accepted. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the +This specifies the output format, the options have the same meaning as the B<-inform> option. =item B<-in filename> @@ -76,7 +76,7 @@ see the B section in L. =item B<-des|-des3|-idea> -These options encrypt the private key with the DES, triple DES, IDEA or +These options encrypt the private key with the DES, triple DES, IDEA or any other cipher supported by OpenSSL before outputting it. A pass phrase is prompted for. 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. This specifies how the elliptic curve parameters are encoded. Possible value are: B, i.e. the ec parameters are specified by a OID, or B where the ec parameters are -explicitly given (see RFC 3279 for the definition of the +explicitly given (see RFC 3279 for the definition of the EC parameters structures). The default value is B. B the B alternative ,as specified in RFC 3279, is currently not implemented in OpenSSL. @@ -152,7 +152,7 @@ To encrypt a private key using triple DES: openssl ec -in key.pem -des3 -out keyout.pem -To convert a private key from PEM to DER format: +To convert a private key from PEM to DER format: openssl ec -in key.pem -outform DER -out keyout.der diff --git a/lib/libssl/src/doc/apps/ecparam.pod b/lib/libssl/src/doc/apps/ecparam.pod index d11c0a27f95..d25cee50f93 100644 --- a/lib/libssl/src/doc/apps/ecparam.pod +++ b/lib/libssl/src/doc/apps/ecparam.pod @@ -36,12 +36,12 @@ This command is used to manipulate or generate EC parameter files. This specifies the input format. The B option uses an ASN.1 DER encoded form compatible with RFC 3279 EcpkParameters. The PEM form is the default -format: it consists of the B format base64 encoded with additional +format: it consists of the B format base64 encoded with additional header and footer lines. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the +This specifies the output format, the options have the same meaning as the B<-inform> option. =item B<-in filename> @@ -94,7 +94,7 @@ the point conversion forms please read the X9.62 standard. This specifies how the elliptic curve parameters are encoded. Possible value are: B, i.e. the ec parameters are specified by a OID, or B where the ec parameters are -explicitly given (see RFC 3279 for the definition of the +explicitly given (see RFC 3279 for the definition of the EC parameters structures). The default value is B. B the B alternative ,as specified in RFC 3279, is currently not implemented in OpenSSL. @@ -133,7 +133,7 @@ PEM format EC parameters use the header and footer lines: -----END EC PARAMETERS----- OpenSSL is currently not able to generate new groups and therefore -B can only create EC parameters from known (named) curves. +B can only create EC parameters from known (named) curves. =head1 EXAMPLES diff --git a/lib/libssl/src/doc/apps/enc.pod b/lib/libssl/src/doc/apps/enc.pod index 3dee4ed9923..05d454b3032 100644 --- a/lib/libssl/src/doc/apps/enc.pod +++ b/lib/libssl/src/doc/apps/enc.pod @@ -100,7 +100,7 @@ the B<-pass> argument. =item B<-nosalt> -do not use a salt +do not use a salt =item B<-salt> @@ -251,7 +251,7 @@ ones provided by configured engines. desx DESX algorithm. gost89 GOST 28147-89 in CFB mode (provided by ccgost engine) - gost89-cnt `GOST 28147-89 in CNT mode (provided by ccgost engine) + gost89-cnt `GOST 28147-89 in CNT mode (provided by ccgost engine) idea-cbc IDEA algorithm in CBC mode idea same as idea-cbc @@ -293,11 +293,11 @@ Just base64 encode a binary file: Decode the same file - openssl base64 -d -in file.b64 -out file.bin + openssl base64 -d -in file.b64 -out file.bin Encrypt a file using triple DES in CBC mode using a prompted password: - openssl des3 -salt -in file.txt -out file.des3 + openssl des3 -salt -in file.txt -out file.des3 Decrypt a file using a supplied password: diff --git a/lib/libssl/src/doc/apps/errstr.pod b/lib/libssl/src/doc/apps/errstr.pod index b3c6ccfc9cb..b209faf75f3 100644 --- a/lib/libssl/src/doc/apps/errstr.pod +++ b/lib/libssl/src/doc/apps/errstr.pod @@ -11,7 +11,7 @@ B =head1 DESCRIPTION Sometimes an application will not load error message and only -numerical forms will be available. The B utility can be used to +numerical forms will be available. The B utility can be used to display the meaning of the hex code. The hex code is the hex digits after the second colon. @@ -22,7 +22,7 @@ The error code: 27594:error:2006D080:lib(32):func(109):reason(128):bss_file.c:107: can be displayed with: - + openssl errstr 2006D080 to produce the error message: diff --git a/lib/libssl/src/doc/apps/gendsa.pod b/lib/libssl/src/doc/apps/gendsa.pod index 8c7f114ca08..8488c7cef8e 100644 --- a/lib/libssl/src/doc/apps/gendsa.pod +++ b/lib/libssl/src/doc/apps/gendsa.pod @@ -26,7 +26,7 @@ The B command generates a DSA private key from a DSA parameter file =item B<-des|-des3|-idea> -These options encrypt the private key with the DES, triple DES, or the +These options encrypt the private key with the DES, triple DES, or the IDEA ciphers respectively before outputting it. A pass phrase is prompted for. If none of these options is specified no encryption is used. diff --git a/lib/libssl/src/doc/apps/genpkey.pod b/lib/libssl/src/doc/apps/genpkey.pod index c74d097fb3d..80e91ed496f 100644 --- a/lib/libssl/src/doc/apps/genpkey.pod +++ b/lib/libssl/src/doc/apps/genpkey.pod @@ -29,7 +29,7 @@ The B command generates a private key. =item B<-out filename> the output filename. If this argument is not specified then standard output is -used. +used. =item B<-outform DER|PEM> @@ -181,7 +181,7 @@ can be used. Generate an RSA private key using default parameters: - openssl genpkey -algorithm RSA -out key.pem + openssl genpkey -algorithm RSA -out key.pem Encrypt output private key using 128 bit AES and the passphrase "hello": @@ -199,7 +199,7 @@ Generate 1024 bit DSA parameters: Generate DSA key from parameters: - openssl genpkey -paramfile dsap.pem -out dsakey.pem + openssl genpkey -paramfile dsap.pem -out dsakey.pem Generate 1024 bit DH parameters: @@ -208,7 +208,7 @@ Generate 1024 bit DH parameters: Generate DH key from parameters: - openssl genpkey -paramfile dhp.pem -out dhkey.pem + openssl genpkey -paramfile dhp.pem -out dhkey.pem =cut diff --git a/lib/libssl/src/doc/apps/genrsa.pod b/lib/libssl/src/doc/apps/genrsa.pod index 7dcac2a779f..608f237b133 100644 --- a/lib/libssl/src/doc/apps/genrsa.pod +++ b/lib/libssl/src/doc/apps/genrsa.pod @@ -29,7 +29,7 @@ The B command generates an RSA private key. =item B<-out filename> the output filename. If this argument is not specified then standard output is -used. +used. =item B<-passout arg> @@ -38,7 +38,7 @@ see the B section in L. =item B<-des|-des3|-idea> -These options encrypt the private key with the DES, triple DES, or the +These options encrypt the private key with the DES, triple DES, or the IDEA ciphers respectively before outputting it. If none of these options is specified no encryption is used. If encryption is used a pass phrase is prompted for if it is not supplied via the B<-passout> argument. diff --git a/lib/libssl/src/doc/apps/ocsp.pod b/lib/libssl/src/doc/apps/ocsp.pod index af2e12e418b..435c83fb858 100644 --- a/lib/libssl/src/doc/apps/ocsp.pod +++ b/lib/libssl/src/doc/apps/ocsp.pod @@ -210,7 +210,7 @@ check is not performed. =item B<-md5|-sha1|-sha256|-ripemod160|...> this option sets digest algorithm to use for certificate identification -in the OCSP request. By default SHA-1 is used. +in the OCSP request. By default SHA-1 is used. =back @@ -263,12 +263,12 @@ option. =item B<-nrequest number> -The OCSP server will exit after receiving B requests, default unlimited. +The OCSP server will exit after receiving B requests, default unlimited. =item B<-nmin minutes>, B<-ndays days> Number of minutes or days when fresh revocation information is available: used in the -B field. If neither option is present then the B field is +B field. If neither option is present then the B field is omitted meaning fresh revocation information is immediately available. =back @@ -338,7 +338,7 @@ Create an OCSP request and write it to a file: openssl ocsp -issuer issuer.pem -cert c1.pem -cert c2.pem -reqout req.der -Send a query to an OCSP responder with URL http://ocsp.myhost.com/ save the +Send a query to an OCSP responder with URL http://ocsp.myhost.com/ save the response to a file and print it out in text form openssl ocsp -issuer issuer.pem -cert c1.pem -cert c2.pem \ diff --git a/lib/libssl/src/doc/apps/openssl.pod b/lib/libssl/src/doc/apps/openssl.pod index 64a160c20a4..c40b50d950b 100644 --- a/lib/libssl/src/doc/apps/openssl.pod +++ b/lib/libssl/src/doc/apps/openssl.pod @@ -23,12 +23,12 @@ v2/v3) and Transport Layer Security (TLS v1) network protocols and related cryptography standards required by them. The B program is a command line tool for using the various -cryptography functions of OpenSSL's B library from the shell. -It can be used for +cryptography functions of OpenSSL's B library from the shell. +It can be used for o Creation and management of private keys, public keys and parameters o Public key cryptographic operations - o Creation of X.509 certificates, CSRs and CRLs + o Creation of X.509 certificates, CSRs and CRLs o Calculation of Message Digests o Encryption and Decryption with Ciphers o SSL/TLS Client and Server Tests @@ -75,7 +75,7 @@ Parse an ASN.1 sequence. =item L|ca(1)> -Certificate Authority (CA) Management. +Certificate Authority (CA) Management. =item L|ciphers(1)> @@ -104,7 +104,7 @@ Obsoleted by L|dhparam(1)>. =item L|dhparam(1)> -Generation and Management of Diffie-Hellman Parameters. Superseded by +Generation and Management of Diffie-Hellman Parameters. Superseded by L|genpkey(1)> and L|pkeyparam(1)> @@ -114,7 +114,7 @@ DSA Data Management. =item L|dsaparam(1)> -DSA Parameter Generation and Management. Superseded by +DSA Parameter Generation and Management. Superseded by L|genpkey(1)> and L|pkeyparam(1)> =item L|ec(1)> @@ -144,7 +144,7 @@ Obsoleted by L|dhparam(1)>. =item L|gendsa(1)> -Generation of DSA Private Key from Parameters. Superseded by +Generation of DSA Private Key from Parameters. Superseded by L|genpkey(1)> and L|pkey(1)> =item L|genpkey(1)> @@ -279,11 +279,11 @@ MDC2 Digest RMD-160 Digest -=item B +=item B SHA Digest -=item B +=item B SHA-1 Digest @@ -408,7 +408,7 @@ L, L, L, L, L, L, L, L, L, -L, L, L +L, L, L =head1 HISTORY diff --git a/lib/libssl/src/doc/apps/pkcs12.pod b/lib/libssl/src/doc/apps/pkcs12.pod index 8e0d91798ac..4070c58e530 100644 --- a/lib/libssl/src/doc/apps/pkcs12.pod +++ b/lib/libssl/src/doc/apps/pkcs12.pod @@ -322,7 +322,7 @@ Output only client certificates to a file: openssl pkcs12 -in file.p12 -clcerts -out file.pem Don't encrypt the private key: - + openssl pkcs12 -in file.p12 -out file.pem -nodes Print some info about a PKCS#12 file: diff --git a/lib/libssl/src/doc/apps/pkcs7.pod b/lib/libssl/src/doc/apps/pkcs7.pod index acfb8100f07..13c5cad262a 100644 --- a/lib/libssl/src/doc/apps/pkcs7.pod +++ b/lib/libssl/src/doc/apps/pkcs7.pod @@ -32,7 +32,7 @@ the DER form with header and footer lines. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the +This specifies the output format, the options have the same meaning as the B<-inform> option. =item B<-in filename> @@ -95,7 +95,7 @@ For compatibility with some CAs it will also accept: There is no option to print out all the fields of a PKCS#7 file. -This PKCS#7 routines only understand PKCS#7 v 1.5 as specified in RFC2315 they +This PKCS#7 routines only understand PKCS#7 v 1.5 as specified in RFC2315 they cannot currently parse, for example, the new CMS as described in RFC2630. =head1 SEE ALSO diff --git a/lib/libssl/src/doc/apps/pkcs8.pod b/lib/libssl/src/doc/apps/pkcs8.pod index 84abee78f3e..d15c89bbbc3 100644 --- a/lib/libssl/src/doc/apps/pkcs8.pod +++ b/lib/libssl/src/doc/apps/pkcs8.pod @@ -49,7 +49,7 @@ private key is used. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the +This specifies the output format, the options have the same meaning as the B<-inform> option. =item B<-in filename> @@ -109,7 +109,7 @@ the public and private keys respectively. This option enables the use of PKCS#5 v2.0 algorithms. Normally PKCS#8 private keys are encrypted with the password based encryption algorithm called B this uses 56 bit DES encryption but it -was the strongest encryption algorithm supported in PKCS#5 v1.5. Using +was the strongest encryption algorithm supported in PKCS#5 v1.5. Using the B<-v2> option PKCS#5 v2.0 algorithms are used which can use any encryption algorithm such as 168 bit triple DES or 128 bit RC2 however not many implementations support PKCS#5 v2.0 yet. If you are just using @@ -238,6 +238,6 @@ the old format at present. =head1 SEE ALSO L, L, L, -L +L =cut diff --git a/lib/libssl/src/doc/apps/pkey.pod b/lib/libssl/src/doc/apps/pkey.pod index 4851223f3fc..77166dd877c 100644 --- a/lib/libssl/src/doc/apps/pkey.pod +++ b/lib/libssl/src/doc/apps/pkey.pod @@ -37,7 +37,7 @@ This specifies the input format DER or PEM. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the +This specifies the output format, the options have the same meaning as the B<-inform> option. =item B<-in filename> @@ -71,7 +71,7 @@ name accepted by EVP_get_cipherbyname() is acceptable such as B. =item B<-text> prints out the various public or private key components in -plain text in addition to the encoded version. +plain text in addition to the encoded version. =item B<-text_pub> @@ -111,7 +111,7 @@ To encrypt a private key using triple DES: openssl pkey -in key.pem -des3 -out keyout.pem -To convert a private key from PEM to DER format: +To convert a private key from PEM to DER format: openssl pkey -in key.pem -outform DER -out keyout.der @@ -130,6 +130,6 @@ To just output the public part of a private key: =head1 SEE ALSO L, L, L, -L, L, L +L, L, L =cut diff --git a/lib/libssl/src/doc/apps/pkeyparam.pod b/lib/libssl/src/doc/apps/pkeyparam.pod index 154f6721af4..81495d2d529 100644 --- a/lib/libssl/src/doc/apps/pkeyparam.pod +++ b/lib/libssl/src/doc/apps/pkeyparam.pod @@ -35,7 +35,7 @@ this option is not specified. =item B<-text> -prints out the parameters in plain text in addition to the encoded version. +prints out the parameters in plain text in addition to the encoded version. =item B<-noout> @@ -64,6 +64,6 @@ PEM format is supported because the key type is determined by the PEM headers. =head1 SEE ALSO L, L, L, -L, L, L +L, L, L =cut diff --git a/lib/libssl/src/doc/apps/pkeyutl.pod b/lib/libssl/src/doc/apps/pkeyutl.pod index 27be9a90079..a88380a7a8b 100644 --- a/lib/libssl/src/doc/apps/pkeyutl.pod +++ b/lib/libssl/src/doc/apps/pkeyutl.pod @@ -80,11 +80,11 @@ for all available algorithms. =item B<-pubin> -the input file is a public key. +the input file is a public key. =item B<-certin> -the input is a certificate containing a public key. +the input is a certificate containing a public key. =item B<-rev> @@ -141,7 +141,7 @@ EVP_get_digestbyname() function for example B. =head1 RSA ALGORITHM The RSA algorithm supports encrypt, decrypt, sign, verify and verifyrecover -operations in general. Some padding modes only support some of these +operations in general. Some padding modes only support some of these operations however. =over 4 @@ -152,7 +152,7 @@ This sets the RSA padding mode. Acceptable values for B are B for PKCS#1 padding, B for SSLv23 padding, B for no padding, B for B mode, B for X9.31 mode and B for PSS. -In PKCS#1 padding if the message digest is not set then the supplied data is +In PKCS#1 padding if the message digest is not set then the supplied data is signed or verified directly instead of using a B structure. If a digest is set then the a B structure is used and its the length must correspond to the digest type. diff --git a/lib/libssl/src/doc/apps/req.pod b/lib/libssl/src/doc/apps/req.pod index 0730d117b39..4f6d64766d0 100644 --- a/lib/libssl/src/doc/apps/req.pod +++ b/lib/libssl/src/doc/apps/req.pod @@ -68,7 +68,7 @@ footer lines. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the +This specifies the output format, the options have the same meaning as the B<-inform> option. =item B<-in filename> @@ -261,7 +261,7 @@ a variety of purposes. =item B<-utf8> -this option causes field values to be interpreted as UTF8 strings, by +this option causes field values to be interpreted as UTF8 strings, by default they are interpreted as ASCII. This means that the field values, whether prompted from a terminal or obtained from a configuration file, must be valid UTF8 strings. @@ -276,7 +276,7 @@ set multiple options. See the L manual page for details. =item B<-reqopt> customise the output format used with B<-text>. The B