[crypto] Add SHA-512 algorithm

This implementation has been verified using the NIST SHA-512 test
vectors.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/crypto/sha256.c b/src/crypto/sha256.c
index 695ae70c39ba3c8053cb7300a42e92f6efd692e2..0360d8d1648c79fe226bf9125e2dd09d4600fad1 100644 (file)
--- a/src/crypto/sha256.c
+++ b/src/crypto/sha256.c
@@ -51,11 +51,11 @@ struct sha256_variables {
        uint32_t f;
        uint32_t g;
        uint32_t h;
-       uint32_t w[64];
+       uint32_t w[SHA256_ROUNDS];
 } __attribute__ (( packed ));
 
 /** SHA-256 constants */
-static const uint32_t k[64] = {
+static const uint32_t k[SHA256_ROUNDS] = {
        0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1,
        0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
        0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786,
@@ -167,7 +167,7 @@ static void sha256_digest ( struct sha256_context *context ) {
        }
 
        /* Initialise w[16..63] */
-       for ( i = 16 ; i < 64 ; i++ ) {
+       for ( i = 16 ; i < SHA256_ROUNDS ; i++ ) {
                s0 = ( ror32 ( w[i-15], 7 ) ^ ror32 ( w[i-15], 18 ) ^
                       ( w[i-15] >> 3 ) );
                s1 = ( ror32 ( w[i-2], 17 ) ^ ror32 ( w[i-2], 19 ) ^
@@ -176,7 +176,7 @@ static void sha256_digest ( struct sha256_context *context ) {
        }
 
        /* Main loop */
-       for ( i = 0 ; i < 64 ; i++ ) {
+       for ( i = 0 ; i < SHA256_ROUNDS ; i++ ) {
                s0 = ( ror32 ( *a, 2 ) ^ ror32 ( *a, 13 ) ^ ror32 ( *a, 22 ) );
                maj = ( ( *a & *b ) ^ ( *a & *c ) ^ ( *b & *c ) );
                t2 = ( s0 + maj );

diff --git a/src/crypto/sha512.c b/src/crypto/sha512.c
new file mode 100644 (file)
index 0000000..814f445
--- /dev/null
+++ b/src/crypto/sha512.c
@@ -0,0 +1,303 @@
+/*
+ * Copyright (C) 2015 Michael Brown <mbrown@fensystems.co.uk>.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+/** @file
+ *
+ * SHA-512 algorithm
+ *
+ */
+
+#include <stdint.h>
+#include <string.h>
+#include <byteswap.h>
+#include <assert.h>
+#include <ipxe/rotate.h>
+#include <ipxe/crypto.h>
+#include <ipxe/asn1.h>
+#include <ipxe/sha512.h>
+
+/** SHA-512 variables */
+struct sha512_variables {
+       /* This layout matches that of struct sha512_digest_data,
+        * allowing for efficient endianness-conversion,
+        */
+       uint64_t a;
+       uint64_t b;
+       uint64_t c;
+       uint64_t d;
+       uint64_t e;
+       uint64_t f;
+       uint64_t g;
+       uint64_t h;
+       uint64_t w[SHA512_ROUNDS];
+} __attribute__ (( packed ));
+
+/** SHA-512 constants */
+static const uint64_t k[SHA512_ROUNDS] = {
+       0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL,
+       0xe9b5dba58189dbbcULL, 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
+       0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, 0xd807aa98a3030242ULL,
+       0x12835b0145706fbeULL, 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
+       0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, 0x9bdc06a725c71235ULL,
+       0xc19bf174cf692694ULL, 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
+       0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL, 0x2de92c6f592b0275ULL,
+       0x4a7484aa6ea6e483ULL, 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
+       0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, 0xb00327c898fb213fULL,
+       0xbf597fc7beef0ee4ULL, 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
+       0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, 0x27b70a8546d22ffcULL,
+       0x2e1b21385c26c926ULL, 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
+       0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, 0x81c2c92e47edaee6ULL,
+       0x92722c851482353bULL, 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
+       0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, 0xd192e819d6ef5218ULL,
+       0xd69906245565a910ULL, 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
+       0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, 0x2748774cdf8eeb99ULL,
+       0x34b0bcb5e19b48a8ULL, 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
+       0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL, 0x748f82ee5defb2fcULL,
+       0x78a5636f43172f60ULL, 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
+       0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, 0xbef9a3f7b2c67915ULL,
+       0xc67178f2e372532bULL, 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
+       0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, 0x06f067aa72176fbaULL,
+       0x0a637dc5a2c898a6ULL, 0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
+       0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, 0x3c9ebe0a15c9bebcULL,
+       0x431d67c49c100d4cULL, 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
+       0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
+};
+
+/** SHA-512 initial digest values */
+static const struct sha512_digest sha512_init_digest = {
+       .h = {
+               cpu_to_be64 ( 0x6a09e667f3bcc908ULL ),
+               cpu_to_be64 ( 0xbb67ae8584caa73bULL ),
+               cpu_to_be64 ( 0x3c6ef372fe94f82bULL ),
+               cpu_to_be64 ( 0xa54ff53a5f1d36f1ULL ),
+               cpu_to_be64 ( 0x510e527fade682d1ULL ),
+               cpu_to_be64 ( 0x9b05688c2b3e6c1fULL ),
+               cpu_to_be64 ( 0x1f83d9abfb41bd6bULL ),
+               cpu_to_be64 ( 0x5be0cd19137e2179ULL ),
+       },
+};
+
+/**
+ * Initialise SHA-512 family algorithm
+ *
+ * @v context          SHA-512 context
+ * @v init             Initial digest values
+ * @v digestsize       Digest size
+ */
+void sha512_family_init ( struct sha512_context *context,
+                         const struct sha512_digest *init,
+                         size_t digestsize ) {
+
+       context->len = 0;
+       context->digestsize = digestsize;
+       memcpy ( &context->ddq.dd.digest, init,
+                sizeof ( context->ddq.dd.digest ) );
+}
+
+/**
+ * Initialise SHA-512 algorithm
+ *
+ * @v ctx              SHA-512 context
+ */
+static void sha512_init ( void *ctx ) {
+       struct sha512_context *context = ctx;
+
+       sha512_family_init ( context, &sha512_init_digest,
+                            sizeof ( struct sha512_digest ) );
+}
+
+/**
+ * Calculate SHA-512 digest of accumulated data
+ *
+ * @v context          SHA-512 context
+ */
+static void sha512_digest ( struct sha512_context *context ) {
+        union {
+               union sha512_digest_data_qwords ddq;
+               struct sha512_variables v;
+       } u;
+       uint64_t *a = &u.v.a;
+       uint64_t *b = &u.v.b;
+       uint64_t *c = &u.v.c;
+       uint64_t *d = &u.v.d;
+       uint64_t *e = &u.v.e;
+       uint64_t *f = &u.v.f;
+       uint64_t *g = &u.v.g;
+       uint64_t *h = &u.v.h;
+       uint64_t *w = u.v.w;
+       uint64_t s0;
+       uint64_t s1;
+       uint64_t maj;
+       uint64_t t1;
+       uint64_t t2;
+       uint64_t ch;
+       unsigned int i;
+
+       /* Sanity checks */
+       assert ( ( context->len % sizeof ( context->ddq.dd.data ) ) == 0 );
+       linker_assert ( &u.ddq.dd.digest.h[0] == a, sha512_bad_layout );
+       linker_assert ( &u.ddq.dd.digest.h[1] == b, sha512_bad_layout );
+       linker_assert ( &u.ddq.dd.digest.h[2] == c, sha512_bad_layout );
+       linker_assert ( &u.ddq.dd.digest.h[3] == d, sha512_bad_layout );
+       linker_assert ( &u.ddq.dd.digest.h[4] == e, sha512_bad_layout );
+       linker_assert ( &u.ddq.dd.digest.h[5] == f, sha512_bad_layout );
+       linker_assert ( &u.ddq.dd.digest.h[6] == g, sha512_bad_layout );
+       linker_assert ( &u.ddq.dd.digest.h[7] == h, sha512_bad_layout );
+       linker_assert ( &u.ddq.dd.data.qword[0] == w, sha512_bad_layout );
+
+       DBGC ( context, "SHA512 digesting:\n" );
+       DBGC_HDA ( context, 0, &context->ddq.dd.digest,
+                  sizeof ( context->ddq.dd.digest ) );
+       DBGC_HDA ( context, context->len, &context->ddq.dd.data,
+                  sizeof ( context->ddq.dd.data ) );
+
+       /* Convert h[0..7] to host-endian, and initialise a, b, c, d,
+        * e, f, g, h, and w[0..15]
+        */
+       for ( i = 0 ; i < ( sizeof ( u.ddq.qword ) /
+                           sizeof ( u.ddq.qword[0] ) ) ; i++ ) {
+               be64_to_cpus ( &context->ddq.qword[i] );
+               u.ddq.qword[i] = context->ddq.qword[i];
+       }
+
+       /* Initialise w[16..79] */
+       for ( i = 16 ; i < SHA512_ROUNDS ; i++ ) {
+               s0 = ( ror64 ( w[i-15], 1 ) ^ ror64 ( w[i-15], 8 ) ^
+                      ( w[i-15] >> 7 ) );
+               s1 = ( ror64 ( w[i-2], 19 ) ^ ror64 ( w[i-2], 61 ) ^
+                      ( w[i-2] >> 6 ) );
+               w[i] = ( w[i-16] + s0 + w[i-7] + s1 );
+       }
+
+       /* Main loop */
+       for ( i = 0 ; i < SHA512_ROUNDS ; i++ ) {
+               s0 = ( ror64 ( *a, 28 ) ^ ror64 ( *a, 34 ) ^ ror64 ( *a, 39 ) );
+               maj = ( ( *a & *b ) ^ ( *a & *c ) ^ ( *b & *c ) );
+               t2 = ( s0 + maj );
+               s1 = ( ror64 ( *e, 14 ) ^ ror64 ( *e, 18 ) ^ ror64 ( *e, 41 ) );
+               ch = ( ( *e & *f ) ^ ( (~*e) & *g ) );
+               t1 = ( *h + s1 + ch + k[i] + w[i] );
+               *h = *g;
+               *g = *f;
+               *f = *e;
+               *e = ( *d + t1 );
+               *d = *c;
+               *c = *b;
+               *b = *a;
+               *a = ( t1 + t2 );
+               DBGC2 ( context, "%2d : %016llx %016llx %016llx %016llx "
+                       "%016llx %016llx %016llx %016llx\n",
+                       i, *a, *b, *c, *d, *e, *f, *g, *h );
+       }
+
+       /* Add chunk to hash and convert back to big-endian */
+       for ( i = 0 ; i < 8 ; i++ ) {
+               context->ddq.dd.digest.h[i] =
+                       cpu_to_be64 ( context->ddq.dd.digest.h[i] +
+                                     u.ddq.dd.digest.h[i] );
+       }
+
+       DBGC ( context, "SHA512 digested:\n" );
+       DBGC_HDA ( context, 0, &context->ddq.dd.digest,
+                  sizeof ( context->ddq.dd.digest ) );
+}
+
+/**
+ * Accumulate data with SHA-512 algorithm
+ *
+ * @v ctx              SHA-512 context
+ * @v data             Data
+ * @v len              Length of data
+ */
+void sha512_update ( void *ctx, const void *data, size_t len ) {
+       struct sha512_context *context = ctx;
+       const uint8_t *byte = data;
+       size_t offset;
+
+       /* Accumulate data a byte at a time, performing the digest
+        * whenever we fill the data buffer
+        */
+       while ( len-- ) {
+               offset = ( context->len % sizeof ( context->ddq.dd.data ) );
+               context->ddq.dd.data.byte[offset] = *(byte++);
+               context->len++;
+               if ( ( context->len % sizeof ( context->ddq.dd.data ) ) == 0 )
+                       sha512_digest ( context );
+       }
+}
+
+/**
+ * Generate SHA-512 digest
+ *
+ * @v ctx              SHA-512 context
+ * @v out              Output buffer
+ */
+void sha512_final ( void *ctx, void *out ) {
+       struct sha512_context *context = ctx;
+       uint64_t len_bits_hi;
+       uint64_t len_bits_lo;
+       uint8_t pad;
+
+       /* Record length before pre-processing */
+       len_bits_hi = 0;
+       len_bits_lo = cpu_to_be64 ( ( ( uint64_t ) context->len ) * 8 );
+
+       /* Pad with a single "1" bit followed by as many "0" bits as required */
+       pad = 0x80;
+       do {
+               sha512_update ( ctx, &pad, sizeof ( pad ) );
+               pad = 0x00;
+       } while ( ( context->len % sizeof ( context->ddq.dd.data ) ) !=
+                 offsetof ( typeof ( context->ddq.dd.data ), final.len_hi ) );
+
+       /* Append length (in bits) */
+       sha512_update ( ctx, &len_bits_hi, sizeof ( len_bits_hi ) );
+       sha512_update ( ctx, &len_bits_lo, sizeof ( len_bits_lo ) );
+       assert ( ( context->len % sizeof ( context->ddq.dd.data ) ) == 0 );
+
+       /* Copy out final digest */
+       memcpy ( out, &context->ddq.dd.digest, context->digestsize );
+}
+
+/** SHA-512 algorithm */
+struct digest_algorithm sha512_algorithm = {
+       .name           = "sha512",
+       .ctxsize        = sizeof ( struct sha512_context ),
+       .blocksize      = sizeof ( union sha512_block ),
+       .digestsize     = sizeof ( struct sha512_digest ),
+       .init           = sha512_init,
+       .update         = sha512_update,
+       .final          = sha512_final,
+};
+
+/** "sha512" object identifier */
+static uint8_t oid_sha512[] = { ASN1_OID_SHA512 };
+
+/** "sha512" OID-identified algorithm */
+struct asn1_algorithm oid_sha512_algorithm __asn1_algorithm = {
+       .name = "sha512",
+       .digest = &sha512_algorithm,
+       .oid = ASN1_OID_CURSOR ( oid_sha512 ),
+};

diff --git a/src/include/ipxe/asn1.h b/src/include/ipxe/asn1.h
index 4e8605fe3db9b78c394fc31cf4f9cd7625683ba0..21cf809fe488b249e1486fb406c6e6fcbde78812 100644 (file)
--- a/src/include/ipxe/asn1.h
+++ b/src/include/ipxe/asn1.h
@@ -160,6 +160,13 @@ struct asn1_builder_header {
        ASN1_OID_SINGLE ( 3 ), ASN1_OID_SINGLE ( 4 ),           \
        ASN1_OID_SINGLE ( 2 ), ASN1_OID_SINGLE ( 1 )
 
+/** ASN.1 OID for id-sha512 (2.16.840.1.101.3.4.2.3) */
+#define ASN1_OID_SHA512                                                \
+       ASN1_OID_INITIAL ( 2, 16 ), ASN1_OID_DOUBLE ( 840 ),    \
+       ASN1_OID_SINGLE ( 1 ), ASN1_OID_SINGLE ( 101 ),         \
+       ASN1_OID_SINGLE ( 3 ), ASN1_OID_SINGLE ( 4 ),           \
+       ASN1_OID_SINGLE ( 2 ), ASN1_OID_SINGLE ( 3 )
+
 /** ASN.1 OID for id-sha224 (2.16.840.1.101.3.4.2.4) */
 #define ASN1_OID_SHA224                                                \
        ASN1_OID_INITIAL ( 2, 16 ), ASN1_OID_DOUBLE ( 840 ),    \

diff --git a/src/include/ipxe/sha256.h b/src/include/ipxe/sha256.h
index 811279a6499200b5a4082cc5e93c6afaee086a78..e234cce3370ad102d36a2bc9b7b152a9da0c53f9 100644 (file)
--- a/src/include/ipxe/sha256.h
+++ b/src/include/ipxe/sha256.h
@@ -12,6 +12,9 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <stdint.h>
 #include <ipxe/crypto.h>
 
+/** SHA-256 number of rounds */
+#define SHA256_ROUNDS 64
+
 /** An SHA-256 digest */
 struct sha256_digest {
        /** Hash output */

diff --git a/src/include/ipxe/sha512.h b/src/include/ipxe/sha512.h
new file mode 100644 (file)
index 0000000..0cfa35b
--- /dev/null
+++ b/src/include/ipxe/sha512.h
@@ -0,0 +1,86 @@
+#ifndef _IPXE_SHA512_H
+#define _IPXE_SHA512_H
+
+/** @file
+ *
+ * SHA-512 algorithm
+ *
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#include <stdint.h>
+#include <ipxe/crypto.h>
+
+/** SHA-512 number of rounds */
+#define SHA512_ROUNDS 80
+
+/** An SHA-512 digest */
+struct sha512_digest {
+       /** Hash output */
+       uint64_t h[8];
+};
+
+/** An SHA-512 data block */
+union sha512_block {
+       /** Raw bytes */
+       uint8_t byte[128];
+       /** Raw qwords */
+       uint64_t qword[16];
+       /** Final block structure */
+       struct {
+               /** Padding */
+               uint8_t pad[112];
+               /** High 64 bits of length in bits */
+               uint64_t len_hi;
+               /** Low 64 bits of length in bits */
+               uint64_t len_lo;
+       } final;
+};
+
+/** SHA-512 digest and data block
+ *
+ * The order of fields within this structure is designed to minimise
+ * code size.
+ */
+struct sha512_digest_data {
+       /** Digest of data already processed */
+       struct sha512_digest digest;
+       /** Accumulated data */
+       union sha512_block data;
+} __attribute__ (( packed ));
+
+/** SHA-512 digest and data block */
+union sha512_digest_data_qwords {
+       /** Digest and data block */
+       struct sha512_digest_data dd;
+       /** Raw qwords */
+       uint64_t qword[ sizeof ( struct sha512_digest_data ) /
+                       sizeof ( uint64_t ) ];
+};
+
+/** An SHA-512 context */
+struct sha512_context {
+       /** Amount of accumulated data */
+       size_t len;
+       /** Digest size */
+       size_t digestsize;
+       /** Digest and accumulated data */
+       union sha512_digest_data_qwords ddq;
+} __attribute__ (( packed ));
+
+/** SHA-512 context size */
+#define SHA512_CTX_SIZE sizeof ( struct sha512_context )
+
+/** SHA-512 digest size */
+#define SHA512_DIGEST_SIZE sizeof ( struct sha512_digest )
+
+extern void sha512_family_init ( struct sha512_context *context,
+                                const struct sha512_digest *init,
+                                size_t digestsize );
+extern void sha512_update ( void *ctx, const void *data, size_t len );
+extern void sha512_final ( void *ctx, void *out );
+
+extern struct digest_algorithm sha512_algorithm;
+
+#endif /* IPXE_SHA512_H */

diff --git a/src/tests/sha512_test.c b/src/tests/sha512_test.c
new file mode 100644 (file)
index 0000000..f97e96e
--- /dev/null
+++ b/src/tests/sha512_test.c
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2015 Michael Brown <mbrown@fensystems.co.uk>.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+/** @file
+ *
+ * SHA-512 tests
+ *
+ * NIST test vectors are taken from
+ *
+ *  http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/SHA512.pdf
+ *
+ */
+
+/* Forcibly enable assertions */
+#undef NDEBUG
+
+#include <ipxe/sha512.h>
+#include <ipxe/test.h>
+#include "digest_test.h"
+
+/* Empty test vector (digest obtained from "sha512sum /dev/null") */
+DIGEST_TEST ( sha512_empty, &sha512_algorithm, DIGEST_EMPTY,
+             DIGEST ( 0xcf, 0x83, 0xe1, 0x35, 0x7e, 0xef, 0xb8, 0xbd, 0xf1,
+                      0x54, 0x28, 0x50, 0xd6, 0x6d, 0x80, 0x07, 0xd6, 0x20,
+                      0xe4, 0x05, 0x0b, 0x57, 0x15, 0xdc, 0x83, 0xf4, 0xa9,
+                      0x21, 0xd3, 0x6c, 0xe9, 0xce, 0x47, 0xd0, 0xd1, 0x3c,
+                      0x5d, 0x85, 0xf2, 0xb0, 0xff, 0x83, 0x18, 0xd2, 0x87,
+                      0x7e, 0xec, 0x2f, 0x63, 0xb9, 0x31, 0xbd, 0x47, 0x41,
+                      0x7a, 0x81, 0xa5, 0x38, 0x32, 0x7a, 0xf9, 0x27, 0xda,
+                      0x3e ) );
+
+/* NIST test vector "abc" */
+DIGEST_TEST ( sha512_nist_abc, &sha512_algorithm, DIGEST_NIST_ABC,
+             DIGEST ( 0xdd, 0xaf, 0x35, 0xa1, 0x93, 0x61, 0x7a, 0xba, 0xcc,
+                      0x41, 0x73, 0x49, 0xae, 0x20, 0x41, 0x31, 0x12, 0xe6,
+                      0xfa, 0x4e, 0x89, 0xa9, 0x7e, 0xa2, 0x0a, 0x9e, 0xee,
+                      0xe6, 0x4b, 0x55, 0xd3, 0x9a, 0x21, 0x92, 0x99, 0x2a,
+                      0x27, 0x4f, 0xc1, 0xa8, 0x36, 0xba, 0x3c, 0x23, 0xa3,
+                      0xfe, 0xeb, 0xbd, 0x45, 0x4d, 0x44, 0x23, 0x64, 0x3c,
+                      0xe8, 0x0e, 0x2a, 0x9a, 0xc9, 0x4f, 0xa5, 0x4c, 0xa4,
+                      0x9f ) );
+
+/* NIST test vector "abc...stu" */
+DIGEST_TEST ( sha512_nist_abc_stu, &sha512_algorithm, DIGEST_NIST_ABC_STU,
+             DIGEST ( 0x8e, 0x95, 0x9b, 0x75, 0xda, 0xe3, 0x13, 0xda, 0x8c,
+                      0xf4, 0xf7, 0x28, 0x14, 0xfc, 0x14, 0x3f, 0x8f, 0x77,
+                      0x79, 0xc6, 0xeb, 0x9f, 0x7f, 0xa1, 0x72, 0x99, 0xae,
+                      0xad, 0xb6, 0x88, 0x90, 0x18, 0x50, 0x1d, 0x28, 0x9e,
+                      0x49, 0x00, 0xf7, 0xe4, 0x33, 0x1b, 0x99, 0xde, 0xc4,
+                      0xb5, 0x43, 0x3a, 0xc7, 0xd3, 0x29, 0xee, 0xb6, 0xdd,
+                      0x26, 0x54, 0x5e, 0x96, 0xe5, 0x5b, 0x87, 0x4b, 0xe9,
+                      0x09 ) );
+
+/**
+ * Perform SHA-512 self-test
+ *
+ */
+static void sha512_test_exec ( void ) {
+
+       /* Correctness tests */
+       digest_ok ( &sha512_empty );
+       digest_ok ( &sha512_nist_abc );
+       digest_ok ( &sha512_nist_abc_stu );
+
+       /* Speed tests */
+       DBG ( "SHA512 required %ld cycles per byte\n",
+             digest_cost ( &sha512_algorithm ) );
+}
+
+/** SHA-512 self-test */
+struct self_test sha512_test __self_test = {
+       .name = "sha512",
+       .exec = sha512_test_exec,
+};

diff --git a/src/tests/tests.c b/src/tests/tests.c
index c2286c9871e6a61eafe1905784939cfea9d7bfdd..40c3379612f6e1a075afe15a24bcb6fdf92f58c9 100644 (file)
--- a/src/tests/tests.c
+++ b/src/tests/tests.c
@@ -49,6 +49,7 @@ REQUIRE_OBJECT ( crc32_test );
 REQUIRE_OBJECT ( md5_test );
 REQUIRE_OBJECT ( sha1_test );
 REQUIRE_OBJECT ( sha256_test );
+REQUIRE_OBJECT ( sha512_test );
 REQUIRE_OBJECT ( aes_cbc_test );
 REQUIRE_OBJECT ( hmac_drbg_test );
 REQUIRE_OBJECT ( hash_df_test );