summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Möller <nisse@lysator.liu.se>2014-01-03 21:26:08 +0100
committerNiels Möller <nisse@lysator.liu.se>2014-01-03 21:26:08 +0100
commit4b98efe1661d14defd2b6a136781979a963a1439 (patch)
treee81adfd88c833efefa6078b96791b2ac96df2660
parente0b78200ee0a35dab24780de80e05f55f92cd667 (diff)
downloadnettle-4b98efe1661d14defd2b6a136781979a963a1439.tar.gz
Zeropad values in sha256 table.
-rw-r--r--ChangeLog5
-rw-r--r--sha256.c4
-rw-r--r--shadata.c4
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c02241e1..f50ef031 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-03 Niels Möller <nisse@lysator.liu.se>
+
+ * shadata.c (main): Zero-pad output values to 8 hex digits.
+ * sha256.c (K): Updated table.
+
2013-12-17 Niels Möller <nisse@lysator.liu.se>
* configure.ac (ASM_RODATA): New substituted variable. Needed for
diff --git a/sha256.c b/sha256.c
index 46cccffe..296909f9 100644
--- a/sha256.c
+++ b/sha256.c
@@ -48,10 +48,10 @@ K[64] =
0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL,
0xd807aa98UL, 0x12835b01UL, 0x243185beUL, 0x550c7dc3UL,
0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL, 0xc19bf174UL,
- 0xe49b69c1UL, 0xefbe4786UL, 0xfc19dc6UL, 0x240ca1ccUL,
+ 0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL,
0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL,
0x983e5152UL, 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL,
- 0xc6e00bf3UL, 0xd5a79147UL, 0x6ca6351UL, 0x14292967UL,
+ 0xc6e00bf3UL, 0xd5a79147UL, 0x06ca6351UL, 0x14292967UL,
0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL, 0x53380d13UL,
0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL,
0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL,
diff --git a/shadata.c b/shadata.c
index cba87269..bef5b7ba 100644
--- a/shadata.c
+++ b/shadata.c
@@ -24,7 +24,7 @@ int main(int argc, char **argv)
double fraction = root - floor(root);
double value = floor(ldexp(fraction, 32));
- printf("0x%lxUL, ", (unsigned long) value);
+ printf("0x%08lxUL, ", (unsigned long) value);
if (!(i % 4))
printf("\n");
}
@@ -37,7 +37,7 @@ int main(int argc, char **argv)
double fraction = root - (floor(root));
double value = floor(ldexp(fraction, 32));
- printf("0x%lxUL, ", (unsigned long) value);
+ printf("0x%08lxUL, ", (unsigned long) value);
if (!(i % 4))
printf("\n");
}