From 2e407ea5c6d24c74531d99eb8c5a8f074542a98c Mon Sep 17 00:00:00 2001 From: willmafh Date: Wed, 4 Dec 2024 11:00:35 +0800 Subject: [PATCH] Code & comments changes to make them in consistent CLA: trivial Reviewed-by: Tom Cosgrove Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/26095) --- crypto/asn1/a_int.c | 22 ++++++++++++++-------- crypto/bn/bn_lib.c | 1 + crypto/modes/siv128.c | 2 +- providers/implementations/kdfs/krb5kdf.c | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c index 7d5dd85fc0..854844e7ea 100644 --- a/crypto/asn1/a_int.c +++ b/crypto/asn1/a_int.c @@ -40,7 +40,7 @@ int ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y) return ret; } -/*- +/* * This converts a big endian buffer and sign into its content encoding. * This is used for INTEGER and ENUMERATED types. * The internal representation is an ASN1_STRING whose data is a big endian @@ -260,12 +260,16 @@ static int asn1_get_int64(int64_t *pr, const unsigned char *b, size_t blen, return 0; if (neg) { if (r <= INT64_MAX) { - /* Most significant bit is guaranteed to be clear, negation - * is guaranteed to be meaningful in platform-neutral sense. */ + /* + * Most significant bit is guaranteed to be clear, negation + * is guaranteed to be meaningful in platform-neutral sense. + */ *pr = -(int64_t)r; } else if (r == ABS_INT64_MIN) { - /* This never happens if INT64_MAX == ABS_INT64_MIN, e.g. - * on ones' complement system. */ + /* + * This never happens if INT64_MAX == ABS_INT64_MIN, e.g. + * on ones'-complement system. + */ *pr = (int64_t)(0 - r); } else { ERR_raise(ERR_LIB_ASN1, ASN1_R_TOO_SMALL); @@ -345,11 +349,13 @@ static int asn1_string_set_int64(ASN1_STRING *a, int64_t r, int itype) a->type = itype; if (r < 0) { - /* Most obvious '-r' triggers undefined behaviour for most + /* + * Most obvious '-r' triggers undefined behaviour for most * common INT64_MIN. Even though below '0 - (uint64_t)r' can - * appear two's complement centric, it does produce correct/ + * appear two's-complement centric, it does produce correct/ * expected result even on ones' complement. This is because - * cast to unsigned has to change bit pattern... */ + * cast to unsigned has to change bit pattern... + */ off = asn1_put_uint64(tbuf, 0 - (uint64_t)r); a->type |= V_ASN1_NEG; } else { diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c index d0e989b2dc..470592731f 100644 --- a/crypto/bn/bn_lib.c +++ b/crypto/bn/bn_lib.c @@ -255,6 +255,7 @@ BIGNUM *BN_new(void) BIGNUM *BN_secure_new(void) { BIGNUM *ret = BN_new(); + if (ret != NULL) ret->flags |= BN_FLG_SECURE; return ret; diff --git a/crypto/modes/siv128.c b/crypto/modes/siv128.c index 19bc515852..e6348a8d37 100644 --- a/crypto/modes/siv128.c +++ b/crypto/modes/siv128.c @@ -69,7 +69,7 @@ static ossl_inline void siv128_xorblock(SIV_BLOCK *x, * Doubles |b|, which is 16 bytes representing an element * of GF(2**128) modulo the irreducible polynomial * x**128 + x**7 + x**2 + x + 1. - * Assumes two's complement arithmetic + * Assumes two's-complement arithmetic */ static ossl_inline void siv128_dbl(SIV_BLOCK *b) { diff --git a/providers/implementations/kdfs/krb5kdf.c b/providers/implementations/kdfs/krb5kdf.c index 07f14b4282..566afa74fe 100644 --- a/providers/implementations/kdfs/krb5kdf.c +++ b/providers/implementations/kdfs/krb5kdf.c @@ -275,7 +275,7 @@ static int fixup_des3_key(unsigned char *key) * * block = 0 * for k: 1 -> K - * block += s[N(k-1)..(N-1)k] (ones' complement addition) + * block += s[N(k-1)..(N-1)k] (ones'-complement addition) * * Optimizing for space we compute: * for each l in L-1 -> 0: