Code & comments changes to make them in consistent

CLA: trivial

Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26095)

diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c
index 7d5dd85fc044ec1ac30d830112b9a77761dd7999..854844e7eaf1fe01230afeb876d55bf8f7293c6e 100644 (file)
--- 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 d0e989b2dc401d69231eb349204eda467701f4ea..470592731fa8fbbfeb758df8a59e9360b45c1e58 100644 (file)
--- 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 19bc5158523a4207090a84a7b10bb3c395e14b75..e6348a8d3753cc818ea681616d43f0880f1d0616 100644 (file)
--- 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 07f14b4282c341c2fc31bfa051b506b4cea0c344..566afa74fece268e1e4f57c31a790de47cb50697 100644 (file)
--- 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: