[crypto] Add SHA-384 algorithm

SHA-384 is almost identical to SHA-512, with differing initial hash
values and a truncated output length.

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

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

diff --git a/src/crypto/sha384.c b/src/crypto/sha384.c
new file mode 100644 (file)
index 0000000..0177518
--- /dev/null
+++ b/src/crypto/sha384.c
@@ -0,0 +1,82 @@
+/*
+ * 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-384 algorithm
+ *
+ */
+
+#include <stdint.h>
+#include <byteswap.h>
+#include <ipxe/crypto.h>
+#include <ipxe/asn1.h>
+#include <ipxe/sha512.h>
+
+/** SHA-384 initial digest values */
+static const struct sha512_digest sha384_init_digest = {
+       .h = {
+               cpu_to_be64 ( 0xcbbb9d5dc1059ed8ULL ),
+               cpu_to_be64 ( 0x629a292a367cd507ULL ),
+               cpu_to_be64 ( 0x9159015a3070dd17ULL ),
+               cpu_to_be64 ( 0x152fecd8f70e5939ULL ),
+               cpu_to_be64 ( 0x67332667ffc00b31ULL ),
+               cpu_to_be64 ( 0x8eb44a8768581511ULL ),
+               cpu_to_be64 ( 0xdb0c2e0d64f98fa7ULL ),
+               cpu_to_be64 ( 0x47b5481dbefa4fa4ULL ),
+       },
+};
+
+/**
+ * Initialise SHA-384 algorithm
+ *
+ * @v ctx              SHA-384 context
+ */
+static void sha384_init ( void *ctx ) {
+       struct sha512_context *context = ctx;
+
+       sha512_family_init ( context, &sha384_init_digest, SHA384_DIGEST_SIZE );
+}
+
+/** SHA-384 algorithm */
+struct digest_algorithm sha384_algorithm = {
+       .name           = "sha384",
+       .ctxsize        = sizeof ( struct sha512_context ),
+       .blocksize      = sizeof ( union sha512_block ),
+       .digestsize     = SHA384_DIGEST_SIZE,
+       .init           = sha384_init,
+       .update         = sha512_update,
+       .final          = sha512_final,
+};
+
+/** "sha384" object identifier */
+static uint8_t oid_sha384[] = { ASN1_OID_SHA384 };
+
+/** "sha384" OID-identified algorithm */
+struct asn1_algorithm oid_sha384_algorithm __asn1_algorithm = {
+       .name = "sha384",
+       .digest = &sha384_algorithm,
+       .oid = ASN1_OID_CURSOR ( oid_sha384 ),
+};

diff --git a/src/include/ipxe/asn1.h b/src/include/ipxe/asn1.h
index 21cf809fe488b249e1486fb406c6e6fcbde78812..7550c474878659d56ddd764332523a6fd98ff24a 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-sha384 (2.16.840.1.101.3.4.2.2) */
+#define ASN1_OID_SHA384                                                \
+       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 ( 2 )
+
 /** 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 ),    \

diff --git a/src/include/ipxe/sha512.h b/src/include/ipxe/sha512.h
index 0cfa35b9ea1b7365724cce46f0ccb7b7b0edf401..44a4c8309b4443d69efc3457581f812625dbe6d6 100644 (file)
--- a/src/include/ipxe/sha512.h
+++ b/src/include/ipxe/sha512.h
@@ -75,6 +75,9 @@ struct sha512_context {
 /** SHA-512 digest size */
 #define SHA512_DIGEST_SIZE sizeof ( struct sha512_digest )
 
+/** SHA-384 digest size */
+#define SHA384_DIGEST_SIZE ( SHA512_DIGEST_SIZE * 384 / 512 )
+
 extern void sha512_family_init ( struct sha512_context *context,
                                 const struct sha512_digest *init,
                                 size_t digestsize );
@@ -82,5 +85,6 @@ 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;
+extern struct digest_algorithm sha384_algorithm;
 
 #endif /* IPXE_SHA512_H */

diff --git a/src/tests/sha512_test.c b/src/tests/sha512_test.c
index f97e96e90c30698001f380f217eda3e7ad0cf767..80dc2f4e740432987ff93bb0489a18078a0dbacc 100644 (file)
--- a/src/tests/sha512_test.c
+++ b/src/tests/sha512_test.c
@@ -25,11 +25,12 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /** @file
  *
- * SHA-512 tests
+ * SHA-512 family tests
  *
  * NIST test vectors are taken from
  *
  *  http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/SHA512.pdf
+ *  http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/SHA384.pdf
  *
  */
 
@@ -73,8 +74,35 @@ DIGEST_TEST ( sha512_nist_abc_stu, &sha512_algorithm, DIGEST_NIST_ABC_STU,
                       0x26, 0x54, 0x5e, 0x96, 0xe5, 0x5b, 0x87, 0x4b, 0xe9,
                       0x09 ) );
 
+/* Empty test vector (digest obtained from "sha384sum /dev/null") */
+DIGEST_TEST ( sha384_empty, &sha384_algorithm, DIGEST_EMPTY,
+             DIGEST ( 0x38, 0xb0, 0x60, 0xa7, 0x51, 0xac, 0x96, 0x38, 0x4c,
+                      0xd9, 0x32, 0x7e, 0xb1, 0xb1, 0xe3, 0x6a, 0x21, 0xfd,
+                      0xb7, 0x11, 0x14, 0xbe, 0x07, 0x43, 0x4c, 0x0c, 0xc7,
+                      0xbf, 0x63, 0xf6, 0xe1, 0xda, 0x27, 0x4e, 0xde, 0xbf,
+                      0xe7, 0x6f, 0x65, 0xfb, 0xd5, 0x1a, 0xd2, 0xf1, 0x48,
+                      0x98, 0xb9, 0x5b ) );
+
+/* NIST test vector "abc" */
+DIGEST_TEST ( sha384_nist_abc, &sha384_algorithm, DIGEST_NIST_ABC,
+             DIGEST ( 0xcb, 0x00, 0x75, 0x3f, 0x45, 0xa3, 0x5e, 0x8b, 0xb5,
+                      0xa0, 0x3d, 0x69, 0x9a, 0xc6, 0x50, 0x07, 0x27, 0x2c,
+                      0x32, 0xab, 0x0e, 0xde, 0xd1, 0x63, 0x1a, 0x8b, 0x60,
+                      0x5a, 0x43, 0xff, 0x5b, 0xed, 0x80, 0x86, 0x07, 0x2b,
+                      0xa1, 0xe7, 0xcc, 0x23, 0x58, 0xba, 0xec, 0xa1, 0x34,
+                      0xc8, 0x25, 0xa7 ) );
+
+/* NIST test vector "abc...stu" */
+DIGEST_TEST ( sha384_nist_abc_stu, &sha384_algorithm, DIGEST_NIST_ABC_STU,
+             DIGEST ( 0x09, 0x33, 0x0c, 0x33, 0xf7, 0x11, 0x47, 0xe8, 0x3d,
+                      0x19, 0x2f, 0xc7, 0x82, 0xcd, 0x1b, 0x47, 0x53, 0x11,
+                      0x1b, 0x17, 0x3b, 0x3b, 0x05, 0xd2, 0x2f, 0xa0, 0x80,
+                      0x86, 0xe3, 0xb0, 0xf7, 0x12, 0xfc, 0xc7, 0xc7, 0x1a,
+                      0x55, 0x7e, 0x2d, 0xb9, 0x66, 0xc3, 0xe9, 0xfa, 0x91,
+                      0x74, 0x60, 0x39 ) );
+
 /**
- * Perform SHA-512 self-test
+ * Perform SHA-512 family self-test
  *
  */
 static void sha512_test_exec ( void ) {
@@ -83,13 +111,18 @@ static void sha512_test_exec ( void ) {
        digest_ok ( &sha512_empty );
        digest_ok ( &sha512_nist_abc );
        digest_ok ( &sha512_nist_abc_stu );
+       digest_ok ( &sha384_empty );
+       digest_ok ( &sha384_nist_abc );
+       digest_ok ( &sha384_nist_abc_stu );
 
        /* Speed tests */
        DBG ( "SHA512 required %ld cycles per byte\n",
              digest_cost ( &sha512_algorithm ) );
+       DBG ( "SHA384 required %ld cycles per byte\n",
+             digest_cost ( &sha384_algorithm ) );
 }
 
-/** SHA-512 self-test */
+/** SHA-512 family self-test */
 struct self_test sha512_test __self_test = {
        .name = "sha512",
        .exec = sha512_test_exec,