Skip to content

Commit

Permalink
Code & comments changes to make them in consistent
Browse files Browse the repository at this point in the history
CLA: trivial

Reviewed-by: Tom Cosgrove <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#26095)
  • Loading branch information
willmafh authored and t8m committed Dec 6, 2024
1 parent df6a69a commit 2e407ea
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 10 deletions.
22 changes: 14 additions & 8 deletions crypto/asn1/a_int.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions crypto/bn/bn_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crypto/modes/siv128.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion providers/implementations/kdfs/krb5kdf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 2e407ea

Please sign in to comment.