[Pkg-openssl-changes] r497 - in openssl/trunk/debian: . patches
Kurt Roeckx
kroeckx at alioth.debian.org
Mon Jun 13 10:05:48 UTC 2011
Author: kroeckx
Date: 2011-06-13 10:05:48 +0000 (Mon, 13 Jun 2011)
New Revision: 497
Added:
openssl/trunk/debian/patches/libdoc-manpgs-pod-spell.patch
openssl/trunk/debian/patches/libssl-misspell.patch
openssl/trunk/debian/patches/openssl-pod-misspell.patch
Modified:
openssl/trunk/debian/changelog
openssl/trunk/debian/patches/series
Log:
Fix pod and spelling errors.
Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog 2011-06-13 09:53:01 UTC (rev 496)
+++ openssl/trunk/debian/changelog 2011-06-13 10:05:48 UTC (rev 497)
@@ -1,8 +1,10 @@
openssl (1.0.0d-3) unstable; urgency=low
* Make it build on sparc64. Patch from Aurelien Jarno. (Closes: #626060)
+ * Apply patches from Scott Schaefer <saschaefer at neurodiverse.org> to
+ fix various pod and spelling errors. (Closes: #622820)
- -- Kurt Roeckx <kurt at roeckx.be> Mon, 13 Jun 2011 09:51:28 +0000
+ -- Kurt Roeckx <kurt at roeckx.be> Mon, 13 Jun 2011 10:01:04 +0000
openssl (1.0.0d-2) unstable; urgency=high
Added: openssl/trunk/debian/patches/libdoc-manpgs-pod-spell.patch
===================================================================
--- openssl/trunk/debian/patches/libdoc-manpgs-pod-spell.patch (rev 0)
+++ openssl/trunk/debian/patches/libdoc-manpgs-pod-spell.patch 2011-06-13 10:05:48 UTC (rev 497)
@@ -0,0 +1,236 @@
+--- a/doc/crypto/ASN1_generate_nconf.pod
++++ b/doc/crypto/ASN1_generate_nconf.pod
+@@ -61,7 +61,7 @@
+ =item B<INTEGER>, B<INT>
+
+ Encodes an ASN1 B<INTEGER> type. The B<value> string represents
+-the value of the integer, it can be preceeded by a minus sign and
++the value of the integer, it can be preceded by a minus sign and
+ is normally interpreted as a decimal value unless the prefix B<0x>
+ is included.
+
+--- a/doc/crypto/BN_BLINDING_new.pod
++++ b/doc/crypto/BN_BLINDING_new.pod
+@@ -48,7 +48,7 @@
+
+ BN_BLINDING_convert_ex() multiplies B<n> with the blinding factor B<A>.
+ If B<r> is not NULL a copy the inverse blinding factor B<Ai> will be
+-returned in B<r> (this is useful if a B<RSA> object is shared amoung
++returned in B<r> (this is useful if a B<RSA> object is shared among
+ several threads). BN_BLINDING_invert_ex() multiplies B<n> with the
+ inverse blinding factor B<Ai>. If B<r> is not NULL it will be used as
+ the inverse blinding.
+--- a/doc/crypto/EVP_BytesToKey.pod
++++ b/doc/crypto/EVP_BytesToKey.pod
+@@ -17,7 +17,7 @@
+
+ EVP_BytesToKey() derives a key and IV from various parameters. B<type> is
+ the cipher to derive the key and IV for. B<md> is the message digest to use.
+-The B<salt> paramter is used as a salt in the derivation: it should point to
++The B<salt> parameter is used as a salt in the derivation: it should point to
+ an 8 byte buffer or NULL if no salt is used. B<data> is a buffer containing
+ B<datal> bytes which is used to derive the keying data. B<count> is the
+ iteration count to use. The derived key and IV will be written to B<key>
+--- a/doc/crypto/EVP_EncryptInit.pod
++++ b/doc/crypto/EVP_EncryptInit.pod
+@@ -152,7 +152,7 @@
+
+ EVP_EncryptInit(), EVP_DecryptInit() and EVP_CipherInit() behave in a
+ similar way to EVP_EncryptInit_ex(), EVP_DecryptInit_ex and
+-EVP_CipherInit_ex() except the B<ctx> paramter does not need to be
++EVP_CipherInit_ex() except the B<ctx> parameter does not need to be
+ initialized and they always use the default cipher implementation.
+
+ EVP_EncryptFinal(), EVP_DecryptFinal() and EVP_CipherFinal() behave in a
+--- a/doc/crypto/EVP_PKEY_cmp.pod
++++ b/doc/crypto/EVP_PKEY_cmp.pod
+@@ -26,7 +26,7 @@
+ The funcion EVP_PKEY_cmp_parameters() compares the parameters of keys
+ B<a> and B<b>.
+
+-The funcion EVP_PKEY_cmp() compares the public key components and paramters
++The funcion EVP_PKEY_cmp() compares the public key components and parameters
+ (if present) of keys B<a> and B<b>.
+
+ =head1 NOTES
+--- a/doc/crypto/X509_STORE_CTX_get_error.pod
++++ b/doc/crypto/X509_STORE_CTX_get_error.pod
+@@ -278,6 +278,8 @@
+ an application specific error. This will never be returned unless explicitly
+ set by an application.
+
++=back
++
+ =head1 NOTES
+
+ The above functions should be used instead of directly referencing the fields
+--- a/doc/crypto/pem.pod
++++ b/doc/crypto/pem.pod
+@@ -201,7 +201,7 @@
+ PEM_write_bio_PKCS8PrivateKey() and PEM_write_PKCS8PrivateKey()
+ write a private key in an EVP_PKEY structure in PKCS#8
+ EncryptedPrivateKeyInfo format using PKCS#5 v2.0 password based encryption
+-algorithms. The B<cipher> argument specifies the encryption algoritm to
++algorithms. The B<cipher> argument specifies the encryption algorithm to
+ use: unlike all other PEM routines the encryption is applied at the
+ PKCS#8 level and not in the PEM headers. If B<cipher> is NULL then no
+ encryption is used and a PKCS#8 PrivateKeyInfo structure is used instead.
+--- a/doc/ssl/SSL_CTX_set_client_CA_list.pod
++++ b/doc/ssl/SSL_CTX_set_client_CA_list.pod
+@@ -70,6 +70,10 @@
+
+ The operation succeeded.
+
++=back
++
++=over 4
++
+ =item 0
+
+ A failure while manipulating the STACK_OF(X509_NAME) object occurred or
+--- a/doc/ssl/SSL_CTX_set_verify.pod
++++ b/doc/ssl/SSL_CTX_set_verify.pod
+@@ -169,8 +169,8 @@
+ failure, if wished. The callback realizes a verification depth limit with
+ more informational output.
+
+-All verification errors are printed, informations about the certificate chain
+-are printed on request.
++All verification errors are printed; information about the certificate chain
++is printed on request.
+ The example is realized for a server that does allow but not require client
+ certificates.
+
+--- a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
++++ b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+@@ -81,6 +81,8 @@
+
+ Return values from the server callback are interpreted as follows:
+
++=over 4
++
+ =item > 0
+
+ PSK identity was found and the server callback has provided the PSK
+@@ -94,9 +96,15 @@
+ connection will fail with decryption_error before it will be finished
+ completely.
+
++=back
++
++=over 4
++
+ =item 0
+
+ PSK identity was not found. An "unknown_psk_identity" alert message
+ will be sent and the connection setup fails.
+
++=back
++
+ =cut
+--- a/doc/ssl/SSL_accept.pod
++++ b/doc/ssl/SSL_accept.pod
+@@ -49,12 +49,20 @@
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+
++=back
++
++=over 4
++
+ =item 0
+
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+ return value B<ret> to find out the reason.
+
++=back
++
++=over 4
++
+ =item E<lt>0
+
+ The TLS/SSL handshake was not successful because a fatal error occurred either
+--- a/doc/ssl/SSL_connect.pod
++++ b/doc/ssl/SSL_connect.pod
+@@ -41,10 +41,13 @@
+
+ =over 4
+
+-=item 1
++=item E<lt>0
+
+-The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+-established.
++The TLS/SSL handshake was not successful, because a fatal error occurred either
++at the protocol level or a connection failure occurred. The shutdown was
++not clean. It can also occur of action is need to continue the operation
++for non-blocking BIOs. Call SSL_get_error() with the return value B<ret>
++to find out the reason.
+
+ =item 0
+
+@@ -52,13 +55,10 @@
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+ return value B<ret> to find out the reason.
+
+-=item E<lt>0
++=item 1
+
+-The TLS/SSL handshake was not successful, because a fatal error occurred either
+-at the protocol level or a connection failure occurred. The shutdown was
+-not clean. It can also occur of action is need to continue the operation
+-for non-blocking BIOs. Call SSL_get_error() with the return value B<ret>
+-to find out the reason.
++The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
++established.
+
+ =back
+
+--- a/doc/ssl/SSL_do_handshake.pod
++++ b/doc/ssl/SSL_do_handshake.pod
+@@ -50,12 +50,20 @@
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+
++=back
++
++=over 4
++
+ =item 0
+
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+ return value B<ret> to find out the reason.
+
++=back
++
++=over 4
++
+ =item E<lt>0
+
+ The TLS/SSL handshake was not successful because a fatal error occurred either
+--- a/doc/ssl/SSL_shutdown.pod
++++ b/doc/ssl/SSL_shutdown.pod
+@@ -97,6 +97,10 @@
+ The shutdown was successfully completed. The "close notify" alert was sent
+ and the peer's "close notify" alert was received.
+
++=back
++
++=over 4
++
+ =item 0
+
+ The shutdown is not yet finished. Call SSL_shutdown() for a second time,
+@@ -104,6 +108,10 @@
+ The output of L<SSL_get_error(3)|SSL_get_error(3)> may be misleading, as an
+ erroneous SSL_ERROR_SYSCALL may be flagged even though no error occurred.
+
++=back
++
++=over 4
++
+ =item -1
+
+ The shutdown was not successful because a fatal error occurred either
Added: openssl/trunk/debian/patches/libssl-misspell.patch
===================================================================
--- openssl/trunk/debian/patches/libssl-misspell.patch (rev 0)
+++ openssl/trunk/debian/patches/libssl-misspell.patch 2011-06-13 10:05:48 UTC (rev 497)
@@ -0,0 +1,11 @@
+--- a/crypto/asn1/asn1_err.c
++++ b/crypto/asn1/asn1_err.c
+@@ -302,7 +302,7 @@
+ {ERR_REASON(ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE),"unknown public key type"},
+ {ERR_REASON(ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM),"unknown signature algorithm"},
+ {ERR_REASON(ASN1_R_UNKNOWN_TAG) ,"unknown tag"},
+-{ERR_REASON(ASN1_R_UNKOWN_FORMAT) ,"unkown format"},
++{ERR_REASON(ASN1_R_UNKOWN_FORMAT) ,"unknown format"},
+ {ERR_REASON(ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE),"unsupported any defined by type"},
+ {ERR_REASON(ASN1_R_UNSUPPORTED_CIPHER) ,"unsupported cipher"},
+ {ERR_REASON(ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM),"unsupported encryption algorithm"},
Added: openssl/trunk/debian/patches/openssl-pod-misspell.patch
===================================================================
--- openssl/trunk/debian/patches/openssl-pod-misspell.patch (rev 0)
+++ openssl/trunk/debian/patches/openssl-pod-misspell.patch 2011-06-13 10:05:48 UTC (rev 497)
@@ -0,0 +1,154 @@
+--- a/apps/ca.c
++++ b/apps/ca.c
+@@ -148,7 +148,7 @@
+ static const char *ca_usage[]={
+ "usage: ca args\n",
+ "\n",
+-" -verbose - Talk alot while doing things\n",
++" -verbose - Talk a lot while doing things\n",
+ " -config file - A config file\n",
+ " -name arg - The particular CA definition to use\n",
+ " -gencrl - Generate a new CRL\n",
+--- a/apps/ecparam.c
++++ b/apps/ecparam.c
+@@ -105,7 +105,7 @@
+ * in the asn1 der encoding
+ * possible values: named_curve (default)
+ * explicit
+- * -no_seed - if 'explicit' parameters are choosen do not use the seed
++ * -no_seed - if 'explicit' parameters are chosen do not use the seed
+ * -genkey - generate ec key
+ * -rand file - files to use for random number input
+ * -engine e - use engine e, possibly a hardware device
+@@ -286,7 +286,7 @@
+ BIO_printf(bio_err, " "
+ " explicit\n");
+ BIO_printf(bio_err, " -no_seed if 'explicit'"
+- " parameters are choosen do not"
++ " parameters are chosen do not"
+ " use the seed\n");
+ BIO_printf(bio_err, " -genkey generate ec"
+ " key\n");
+--- a/crypto/evp/encode.c
++++ b/crypto/evp/encode.c
+@@ -250,7 +250,7 @@
+ /* We parse the input data */
+ for (i=0; i<inl; i++)
+ {
+- /* If the current line is > 80 characters, scream alot */
++ /* If the current line is > 80 characters, scream a lot */
+ if (ln >= 80) { rv= -1; goto end; }
+
+ /* Get char and put it into the buffer */
+--- a/doc/apps/c_rehash.pod
++++ b/doc/apps/c_rehash.pod
+@@ -42,12 +42,12 @@
+
+ Colon separated list of directories to operate on. Ignored if directories are listed on the command line.
+
++=back
++
+ =head1 SEE ALSO
+
+ L<openssl(1)|openssl(1)>, L<x509(1)|x509(1)>
+
+-=back
+-
+ =head1 BUGS
+
+ No known bugs
+--- a/doc/apps/config.pod
++++ b/doc/apps/config.pod
+@@ -119,7 +119,7 @@
+ information.
+
+ The section pointed to by B<engines> is a table of engine names (though see
+-B<engine_id> below) and further sections containing configuration informations
++B<engine_id> below) and further sections containing configuration information
+ specific to each ENGINE.
+
+ Each ENGINE specific section is used to set default algorithms, load
+--- a/doc/apps/genpkey.pod
++++ b/doc/apps/genpkey.pod
+@@ -114,6 +114,8 @@
+
+ The number of bits in the generated parameters. If not specified 1024 is used.
+
++=back
++
+ =head1 DH PARAMETER GENERATION OPTIONS
+
+ =over 4
+--- a/doc/apps/openssl.pod
++++ b/doc/apps/openssl.pod
+@@ -287,8 +287,6 @@
+
+ SHA-1 Digest
+
+-=back
+-
+ =item B<sha224>
+
+ SHA-224 Digest
+@@ -305,6 +303,8 @@
+
+ SHA-512 Digest
+
++=back
++
+ =head2 ENCODING AND CIPHER COMMANDS
+
+ =over 10
+--- a/doc/apps/req.pod
++++ b/doc/apps/req.pod
+@@ -159,7 +159,7 @@
+ the algorithm is determined by the parameters. B<algname:file> use algorithm
+ B<algname> and parameter file B<file>: the two algorithms must match or an
+ error occurs. B<algname> just uses algorithm B<algname>, and parameters,
+-if neccessary should be specified via B<-pkeyopt> parameter.
++if necessary should be specified via B<-pkeyopt> parameter.
+
+ B<dsa:filename> generates a DSA key using the parameters
+ in the file B<filename>. B<ec:filename> generates EC key (usable both with
+--- a/doc/apps/ts.pod
++++ b/doc/apps/ts.pod
+@@ -352,7 +352,7 @@
+
+ This is the main section and it specifies the name of another section
+ that contains all the options for the B<-reply> command. This default
+-section can be overriden with the B<-section> command line switch. (Optional)
++section can be overridden with the B<-section> command line switch. (Optional)
+
+ =item B<oid_file>
+
+@@ -453,7 +453,7 @@
+ =head1 ENVIRONMENT VARIABLES
+
+ B<OPENSSL_CONF> contains the path of the configuration file and can be
+-overriden by the B<-config> command line option.
++overridden by the B<-config> command line option.
+
+ =head1 EXAMPLES
+
+--- a/doc/apps/tsget.pod
++++ b/doc/apps/tsget.pod
+@@ -124,7 +124,7 @@
+ =item [request]...
+
+ List of files containing B<RFC 3161> DER-encoded time stamp requests. If no
+-requests are specifed only one request will be sent to the server and it will be
++requests are specified only one request will be sent to the server and it will be
+ read from the standard input. (Optional)
+
+ =back
+--- a/doc/apps/x509v3_config.pod
++++ b/doc/apps/x509v3_config.pod
+@@ -174,7 +174,7 @@
+
+ The value of B<dirName> should point to a section containing the distinguished
+ name to use as a set of name value pairs. Multi values AVAs can be formed by
+-preceeding the name with a B<+> character.
++preceding the name with a B<+> character.
+
+ otherName can include arbitrary data associated with an OID: the value
+ should be the OID followed by a semicolon and the content in standard
Modified: openssl/trunk/debian/patches/series
===================================================================
--- openssl/trunk/debian/patches/series 2011-06-13 09:53:01 UTC (rev 496)
+++ openssl/trunk/debian/patches/series 2011-06-13 10:05:48 UTC (rev 497)
@@ -18,3 +18,7 @@
version-script.patch
gnu_source.patch
c_rehash-compat.patch
+libdoc-manpgs-pod-spell.patch
+libssl-misspell.patch
+openssl-pod-misspell.patch
+
More information about the Pkg-openssl-changes
mailing list