From: Scott Schaefer <saschaefer@neurodiverse.org>
Date: Mon, 11 Aug 2014 15:37:18 +0000 (-0400)
Subject: RT 2517: Various typo's.
X-Git-Tag: master-post-reformat~529^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=590bdcc68686ff9421949c51ebe7156dfdcf8f88;p=oweals%2Fopenssl.git

RT 2517: Various typo's.

Many of these were already fixed, this catches the last
few that were missed.
---

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 8bc24d3225..51bd621c9c 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -1165,6 +1165,10 @@ ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it);
 int SMIME_crlf_copy(BIO *in, BIO *out, int flags);
 int SMIME_text(BIO *in, BIO *out);
 
+/* Older versions had the following typo'd name, so for a while, anyway,
+ * we provide the old broken name as well. */
+#define ASN1_R_UNKOWN_FORMAT ASN1_R_UNKNOWN_FORMAT
+
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
diff --git a/crypto/asn1/asn1_err.c b/crypto/asn1/asn1_err.c
index 70c7d1b839..f09f49b082 100644
--- a/crypto/asn1/asn1_err.c
+++ b/crypto/asn1/asn1_err.c
@@ -310,7 +310,7 @@ static ERR_STRING_DATA ASN1_str_reasons[]=
 {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)        ,"unknown format"},
+{ERR_REASON(ASN1_R_UNKNOWN_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"},
diff --git a/doc/crypto/EVP_EncryptInit.pod b/doc/crypto/EVP_EncryptInit.pod
index e440463756..b2f65ed1e8 100644
--- a/doc/crypto/EVP_EncryptInit.pod
+++ b/doc/crypto/EVP_EncryptInit.pod
@@ -161,7 +161,7 @@ after all operations using a cipher are complete so sensitive information
 does not remain in memory.
 
 EVP_EncryptInit(), EVP_DecryptInit() and EVP_CipherInit() behave in a
-similar way to EVP_EncryptInit_ex(), EVP_DecryptInit_ex and
+similar way to EVP_EncryptInit_ex(), EVP_DecryptInit_ex() and
 EVP_CipherInit_ex() except the B<ctx> parameter does not need to be
 initialized and they always use the default cipher implementation.