diff options
author | jsing <> | 2023-05-28 14:54:37 +0000 |
---|---|---|
committer | jsing <> | 2023-05-28 14:54:37 +0000 |
commit | 67e1b85b1918f05b87abbb8c119bcf7c674bbcbd (patch) | |
tree | 33ff2311ef981cd2c67b223dc84eddc68fc68b2b /src/lib | |
parent | 1227f74ef4abd07e37aff33a87030eb9a5aac425 (diff) | |
download | openbsd-67e1b85b1918f05b87abbb8c119bcf7c674bbcbd.tar.gz openbsd-67e1b85b1918f05b87abbb8c119bcf7c674bbcbd.tar.bz2 openbsd-67e1b85b1918f05b87abbb8c119bcf7c674bbcbd.zip |
Sprinkle some style(9).
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/sha/sha256.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/libcrypto/sha/sha256.c b/src/lib/libcrypto/sha/sha256.c index ffc5ff7da5..8432f5fce4 100644 --- a/src/lib/libcrypto/sha/sha256.c +++ b/src/lib/libcrypto/sha/sha256.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sha256.c,v 1.21 2023/05/28 14:49:21 jsing Exp $ */ | 1 | /* $OpenBSD: sha256.c,v 1.22 2023/05/28 14:54:37 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -74,7 +74,7 @@ | |||
74 | #ifndef SHA256_ASM | 74 | #ifndef SHA256_ASM |
75 | static | 75 | static |
76 | #endif | 76 | #endif |
77 | void sha256_block_data_order (SHA256_CTX *ctx, const void *in, size_t num); | 77 | void sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num); |
78 | 78 | ||
79 | #define HASH_NO_UPDATE | 79 | #define HASH_NO_UPDATE |
80 | #define HASH_NO_TRANSFORM | 80 | #define HASH_NO_TRANSFORM |
@@ -198,7 +198,7 @@ static void | |||
198 | sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num) | 198 | sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num) |
199 | { | 199 | { |
200 | unsigned MD32_REG_T a, b, c, d, e, f, g, h, s0, s1, T1; | 200 | unsigned MD32_REG_T a, b, c, d, e, f, g, h, s0, s1, T1; |
201 | SHA_LONG X[16]; | 201 | SHA_LONG X[16]; |
202 | int i; | 202 | int i; |
203 | const unsigned char *data = in; | 203 | const unsigned char *data = in; |
204 | 204 | ||
@@ -332,7 +332,7 @@ sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num) | |||
332 | int | 332 | int |
333 | SHA224_Init(SHA256_CTX *c) | 333 | SHA224_Init(SHA256_CTX *c) |
334 | { | 334 | { |
335 | memset (c, 0, sizeof(*c)); | 335 | memset(c, 0, sizeof(*c)); |
336 | 336 | ||
337 | c->h[0] = 0xc1059ed8UL; | 337 | c->h[0] = 0xc1059ed8UL; |
338 | c->h[1] = 0x367cd507UL; | 338 | c->h[1] = 0x367cd507UL; |
@@ -381,7 +381,7 @@ SHA224(const unsigned char *d, size_t n, unsigned char *md) | |||
381 | int | 381 | int |
382 | SHA256_Init(SHA256_CTX *c) | 382 | SHA256_Init(SHA256_CTX *c) |
383 | { | 383 | { |
384 | memset (c, 0, sizeof(*c)); | 384 | memset(c, 0, sizeof(*c)); |
385 | 385 | ||
386 | c->h[0] = 0x6a09e667UL; | 386 | c->h[0] = 0x6a09e667UL; |
387 | c->h[1] = 0xbb67ae85UL; | 387 | c->h[1] = 0xbb67ae85UL; |
@@ -408,12 +408,12 @@ SHA256_Update(SHA256_CTX *c, const void *data_, size_t len) | |||
408 | if (len == 0) | 408 | if (len == 0) |
409 | return 1; | 409 | return 1; |
410 | 410 | ||
411 | l = (c->Nl + (((SHA_LONG)len) << 3))&0xffffffffUL; | 411 | l = (c->Nl + (((SHA_LONG)len) << 3)) & 0xffffffffUL; |
412 | /* 95-05-24 eay Fixed a bug with the overflow handling, thanks to | 412 | /* 95-05-24 eay Fixed a bug with the overflow handling, thanks to |
413 | * Wei Dai <weidai@eskimo.com> for pointing it out. */ | 413 | * Wei Dai <weidai@eskimo.com> for pointing it out. */ |
414 | if (l < c->Nl) /* overflow */ | 414 | if (l < c->Nl) /* overflow */ |
415 | c->Nh++; | 415 | c->Nh++; |
416 | c->Nh+=(SHA_LONG)(len>>29); /* might cause compiler warning on 16-bit */ | 416 | c->Nh += (SHA_LONG)(len >> 29); /* might cause compiler warning on 16-bit */ |
417 | c->Nl = l; | 417 | c->Nl = l; |
418 | 418 | ||
419 | n = c->num; | 419 | n = c->num; |
@@ -421,15 +421,15 @@ SHA256_Update(SHA256_CTX *c, const void *data_, size_t len) | |||
421 | p = (unsigned char *)c->data; | 421 | p = (unsigned char *)c->data; |
422 | 422 | ||
423 | if (len >= SHA_CBLOCK || len + n >= SHA_CBLOCK) { | 423 | if (len >= SHA_CBLOCK || len + n >= SHA_CBLOCK) { |
424 | memcpy (p + n, data, SHA_CBLOCK - n); | 424 | memcpy(p + n, data, SHA_CBLOCK - n); |
425 | sha256_block_data_order(c, p, 1); | 425 | sha256_block_data_order(c, p, 1); |
426 | n = SHA_CBLOCK - n; | 426 | n = SHA_CBLOCK - n; |
427 | data += n; | 427 | data += n; |
428 | len -= n; | 428 | len -= n; |
429 | c->num = 0; | 429 | c->num = 0; |
430 | memset (p,0,SHA_CBLOCK); /* keep it zeroed */ | 430 | memset(p, 0, SHA_CBLOCK); /* keep it zeroed */ |
431 | } else { | 431 | } else { |
432 | memcpy (p + n, data, len); | 432 | memcpy(p + n, data, len); |
433 | c->num += (unsigned int)len; | 433 | c->num += (unsigned int)len; |
434 | return 1; | 434 | return 1; |
435 | } | 435 | } |
@@ -438,7 +438,7 @@ SHA256_Update(SHA256_CTX *c, const void *data_, size_t len) | |||
438 | n = len/SHA_CBLOCK; | 438 | n = len/SHA_CBLOCK; |
439 | if (n > 0) { | 439 | if (n > 0) { |
440 | sha256_block_data_order(c, data, n); | 440 | sha256_block_data_order(c, data, n); |
441 | n *= SHA_CBLOCK; | 441 | n *= SHA_CBLOCK; |
442 | data += n; | 442 | data += n; |
443 | len -= n; | 443 | len -= n; |
444 | } | 444 | } |
@@ -446,7 +446,7 @@ SHA256_Update(SHA256_CTX *c, const void *data_, size_t len) | |||
446 | if (len != 0) { | 446 | if (len != 0) { |
447 | p = (unsigned char *)c->data; | 447 | p = (unsigned char *)c->data; |
448 | c->num = (unsigned int)len; | 448 | c->num = (unsigned int)len; |
449 | memcpy (p, data, len); | 449 | memcpy(p, data, len); |
450 | } | 450 | } |
451 | return 1; | 451 | return 1; |
452 | } | 452 | } |
@@ -469,11 +469,11 @@ SHA256_Final(unsigned char *md, SHA256_CTX *c) | |||
469 | n++; | 469 | n++; |
470 | 470 | ||
471 | if (n > (SHA_CBLOCK - 8)) { | 471 | if (n > (SHA_CBLOCK - 8)) { |
472 | memset (p + n, 0, SHA_CBLOCK - n); | 472 | memset(p + n, 0, SHA_CBLOCK - n); |
473 | n = 0; | 473 | n = 0; |
474 | sha256_block_data_order(c, p, 1); | 474 | sha256_block_data_order(c, p, 1); |
475 | } | 475 | } |
476 | memset (p + n, 0, SHA_CBLOCK - 8 - n); | 476 | memset(p + n, 0, SHA_CBLOCK - 8 - n); |
477 | 477 | ||
478 | p += SHA_CBLOCK - 8; | 478 | p += SHA_CBLOCK - 8; |
479 | #if defined(DATA_ORDER_IS_BIG_ENDIAN) | 479 | #if defined(DATA_ORDER_IS_BIG_ENDIAN) |
@@ -486,7 +486,7 @@ SHA256_Final(unsigned char *md, SHA256_CTX *c) | |||
486 | p -= SHA_CBLOCK; | 486 | p -= SHA_CBLOCK; |
487 | sha256_block_data_order(c, p, 1); | 487 | sha256_block_data_order(c, p, 1); |
488 | c->num = 0; | 488 | c->num = 0; |
489 | memset (p, 0, SHA_CBLOCK); | 489 | memset(p, 0, SHA_CBLOCK); |
490 | 490 | ||
491 | /* | 491 | /* |
492 | * Note that FIPS180-2 discusses "Truncation of the Hash Function Output." | 492 | * Note that FIPS180-2 discusses "Truncation of the Hash Function Output." |