Fix typos

CLA: trivial

Signed-off-by: MichaM <contact-micha+github@posteo.de>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14879)

diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
index 81f9f1ef49f286d53a4b523d0ef92ab28d6aa78a..517ebc0a010338b2368da58df81c38ba2559f96a 100644 (file)
--- a/crypto/err/openssl.txt
+++ b/crypto/err/openssl.txt
@@ -668,8 +668,8 @@ EVP_R_EXPECTING_AN_HMAC_KEY:174:expecting an hmac key
 EVP_R_EXPECTING_AN_RSA_KEY:127:expecting an rsa key
 EVP_R_EXPECTING_A_DH_KEY:128:expecting a dh key
 EVP_R_EXPECTING_A_DSA_KEY:129:expecting a dsa key
-EVP_R_EXPECTING_A_ECX_KEY:219:expecting a ecx key
-EVP_R_EXPECTING_A_EC_KEY:142:expecting a ec key
+EVP_R_EXPECTING_A_ECX_KEY:219:expecting an ecx key
+EVP_R_EXPECTING_A_EC_KEY:142:expecting an ec key
 EVP_R_EXPECTING_A_POLY1305_KEY:164:expecting a poly1305 key
 EVP_R_EXPECTING_A_SIPHASH_KEY:175:expecting a siphash key
 EVP_R_FINAL_ERROR:188:final error

diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c
index 850de00ca9d544970cf571371b184d51977a8a4d..7fa3fbf400fae7166e7c5efde301948907101b4f 100644 (file)
--- a/crypto/evp/evp_err.c
+++ b/crypto/evp/evp_err.c
@@ -65,8 +65,8 @@ static const ERR_STRING_DATA EVP_str_reasons[] = {
     {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_DSA_KEY),
     "expecting a dsa key"},
     {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_ECX_KEY),
-    "expecting a ecx key"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_EC_KEY), "expecting a ec key"},
+    "expecting an ecx key"},
+    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_EC_KEY), "expecting an ec key"},
     {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_POLY1305_KEY),
     "expecting a poly1305 key"},
     {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_SIPHASH_KEY),

diff --git a/include/openssl/ec.h b/include/openssl/ec.h
index c503954b9ce3abd2edfca6adeba4d842f4aabef8..970570c1ede062568b49a437d22e2e505af635f6 100644 (file)
--- a/include/openssl/ec.h
+++ b/include/openssl/ec.h
@@ -296,7 +296,7 @@ unsigned char *EC_GROUP_get0_seed(const EC_GROUP *x);
 size_t EC_GROUP_get_seed_len(const EC_GROUP *);
 size_t EC_GROUP_set_seed(EC_GROUP *, const unsigned char *, size_t len);
 
-/** Sets the parameters of a ec curve defined by y^2 = x^3 + a*x + b (for GFp)
+/** Sets the parameters of an ec curve defined by y^2 = x^3 + a*x + b (for GFp)
  *  or y^2 + x*y = x^3 + a*x^2 + b (for GF2m)
  *  \param  group  EC_GROUP object
  *  \param  p      BIGNUM with the prime number (GFp) or the polynomial
@@ -1222,7 +1222,7 @@ OSSL_DEPRECATEDIN_3_0 int i2d_ECParameters(const EC_KEY *key,
 /*         (octet string, not DER -- hence 'o2i' and 'i2o')         */
 /********************************************************************/
 
-/** Decodes a ec public key from a octet string.
+/** Decodes an ec public key from a octet string.
  *  \param  key  a pointer to a EC_KEY object which should be used
  *  \param  in   memory buffer with the encoded public key
  *  \param  len  length of the encoded public key
@@ -1232,7 +1232,7 @@ OSSL_DEPRECATEDIN_3_0 int i2d_ECParameters(const EC_KEY *key,
 OSSL_DEPRECATEDIN_3_0 EC_KEY *o2i_ECPublicKey(EC_KEY **key,
                                               const unsigned char **in, long len);
 
-/** Encodes a ec public key in an octet string.
+/** Encodes an ec public key in an octet string.
  *  \param  key  the EC_KEY object with the public key
  *  \param  out  the buffer for the result (if NULL the function returns number
  *               of bytes needed).

diff --git a/test/acvp_test.c b/test/acvp_test.c
index c2b024da012da7b1a36d331e7bd4f3b8c0b164f5..0510cc2c0541ba3e906eb00291b3594f1e8c1cea 100644 (file)
--- a/test/acvp_test.c
+++ b/test/acvp_test.c
@@ -206,7 +206,7 @@ err:
     return ret;
 }
 
-/* Extract r and s  from a ecdsa signature */
+/* Extract r and s  from an ecdsa signature */
 static int get_ecdsa_sig_rs_bytes(const unsigned char *sig, size_t sig_len,
                                   unsigned char **r, unsigned char **s,
                                   size_t *rlen, size_t *slen)