diff options
author | Pauli <paul.dale@oracle.com> | 2020-06-11 09:42:34 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2020-07-30 20:15:22 +1000 |
commit | aa97970c1a69ae15b4191aa58cdb56e016f15922 (patch) | |
tree | 334eb2ed6149c2bef803994882eef4d5ac222122 | |
parent | adf3f83e5227206a011ca1bca3ef9f63709fb96e (diff) |
unify spelling of serialize
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12104)
-rw-r--r-- | apps/s_server.c | 2 | ||||
-rw-r--r-- | crypto/bn/bn_mont.c | 2 | ||||
-rw-r--r-- | crypto/ec/curve448/eddsa.c | 2 | ||||
-rw-r--r-- | crypto/ec/ecp_nistp256.c | 4 | ||||
-rw-r--r-- | crypto/ec/ecp_nistp521.c | 4 | ||||
-rw-r--r-- | include/openssl/ct.h | 2 | ||||
-rw-r--r-- | include/openssl/dsa.h | 2 | ||||
-rw-r--r-- | ssl/s3_cbc.c | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index 15d479ce0e..5f16dcdea4 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -3647,7 +3647,7 @@ static int generate_session_id(SSL *ssl, unsigned char *id, /* * By default s_server uses an in-memory cache which caches SSL_SESSION - * structures without any serialisation. This hides some bugs which only + * structures without any serialization. This hides some bugs which only * become apparent in deployed servers. By implementing a basic external * session cache some issues can be debugged using s_server. */ diff --git a/crypto/bn/bn_mont.c b/crypto/bn/bn_mont.c index 6e6848c647..778b45244c 100644 --- a/crypto/bn/bn_mont.c +++ b/crypto/bn/bn_mont.c @@ -437,7 +437,7 @@ BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, CRYPTO_RWLOCK *lock, return ret; /* - * We don't want to serialise globally while doing our lazy-init math in + * We don't want to serialize globally while doing our lazy-init math in * BN_MONT_CTX_set. That punishes threads that are doing independent * things. Instead, punish the case where more than one thread tries to * lazy-init the same 'pmont', by having each do the lazy-init math work diff --git a/crypto/ec/curve448/eddsa.c b/crypto/ec/curve448/eddsa.c index d8c2f88218..f4fbaf7539 100644 --- a/crypto/ec/curve448/eddsa.c +++ b/crypto/ec/curve448/eddsa.c @@ -169,7 +169,7 @@ c448_error_t c448_ed448_sign( { /* - * Schedule the secret key, First EDDSA_448_PRIVATE_BYTES is serialised + * Schedule the secret key, First EDDSA_448_PRIVATE_BYTES is serialized * secret scalar,next EDDSA_448_PRIVATE_BYTES bytes is the seed. */ uint8_t expanded[EDDSA_448_PRIVATE_BYTES * 2]; diff --git a/crypto/ec/ecp_nistp256.c b/crypto/ec/ecp_nistp256.c index fb9b22554d..8bf25e389e 100644 --- a/crypto/ec/ecp_nistp256.c +++ b/crypto/ec/ecp_nistp256.c @@ -59,7 +59,7 @@ typedef uint64_t u64; /* * The underlying field. P256 operates over GF(2^256-2^224+2^192+2^96-1). We - * can serialise an element of this field into 32 bytes. We call this an + * can serialize an element of this field into 32 bytes. We call this an * felem_bytearray. */ @@ -138,7 +138,7 @@ static void bin32_to_felem(felem out, const u8 in[32]) } /* - * smallfelem_to_bin32 takes a smallfelem and serialises into a little + * smallfelem_to_bin32 takes a smallfelem and serializes into a little * endian, 32 byte array. This assumes that the CPU is little-endian. */ static void smallfelem_to_bin32(u8 out[32], const smallfelem in) diff --git a/crypto/ec/ecp_nistp521.c b/crypto/ec/ecp_nistp521.c index 0e7f1dae3b..455885aa09 100644 --- a/crypto/ec/ecp_nistp521.c +++ b/crypto/ec/ecp_nistp521.c @@ -55,7 +55,7 @@ typedef uint8_t u8; typedef uint64_t u64; /* - * The underlying field. P521 operates over GF(2^521-1). We can serialise an + * The underlying field. P521 operates over GF(2^521-1). We can serialize an * element of this field into 66 bytes where the most significant byte * contains only a single bit. We call this an felem_bytearray. */ @@ -156,7 +156,7 @@ static void bin66_to_felem(felem out, const u8 in[66]) } /* - * felem_to_bin66 takes an felem and serialises into a little endian, 66 byte + * felem_to_bin66 takes an felem and serializes into a little endian, 66 byte * array. This assumes that the CPU is little-endian. */ static void felem_to_bin66(u8 out[66], const felem in) diff --git a/include/openssl/ct.h b/include/openssl/ct.h index 280f7ceecf..a69c986f06 100644 --- a/include/openssl/ct.h +++ b/include/openssl/ct.h @@ -331,7 +331,7 @@ __owur int SCT_LIST_validate(const STACK_OF(SCT) *scts, /********************************* - * SCT parsing and serialisation * + * SCT parsing and serialization * *********************************/ /* diff --git a/include/openssl/dsa.h b/include/openssl/dsa.h index a7d32eee98..915870acbf 100644 --- a/include/openssl/dsa.h +++ b/include/openssl/dsa.h @@ -76,7 +76,7 @@ typedef struct DSA_SIG_st DSA_SIG; /* * TODO(3.0): consider removing the ASN.1 encoding and decoding when - * deserialisation is completed elsewhere. + * deserialization is completed elsewhere. */ # define d2i_DSAparams_fp(fp, x) \ (DSA *)ASN1_d2i_fp((char *(*)())DSA_new, \ diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c index d6198dddb9..ec1f3cf83b 100644 --- a/ssl/s3_cbc.c +++ b/ssl/s3_cbc.c @@ -34,7 +34,7 @@ #define MAX_HASH_BLOCK_SIZE 128 /* - * u32toLE serialises an unsigned, 32-bit number (n) as four bytes at (p) in + * u32toLE serializes an unsigned, 32-bit number (n) as four bytes at (p) in * little-endian order. The value of p is advanced by four. */ #define u32toLE(n, p) \ |