From 4df1ead59232a1282043bae0d731986c44e7767f Mon Sep 17 00:00:00 2001
From: John Galt <centromere@users.noreply.github.com>
Date: Fri, 13 Nov 2015 15:56:25 -0500
Subject: [PATCH] Removed unnecessary code

---
 cbits/blake2/blake2b.c  | 39 ---------------------------------------
 cbits/blake2/blake2bp.c | 37 -------------------------------------
 cbits/blake2/blake2s.c  | 40 ----------------------------------------
 cbits/blake2/blake2sp.c | 35 -----------------------------------
 4 files changed, 151 deletions(-)

diff --git a/cbits/blake2/blake2b.c b/cbits/blake2/blake2b.c
index 0a2886b..7026d62 100644
--- a/cbits/blake2/blake2b.c
+++ b/cbits/blake2/blake2b.c
@@ -401,42 +401,3 @@ int blake2b( uint8_t *out, const void *in, const void *key, const uint8_t outlen
   blake2b_final( S, out, outlen );
   return 0;
 }
-
-#if defined(SUPERCOP)
-int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen )
-{
-  return blake2b( out, in, NULL, BLAKE2B_OUTBYTES, inlen, 0 );
-}
-#endif
-
-#if defined(BLAKE2B_SELFTEST)
-#include <string.h>
-#include "blake2-kat.h"
-int main( int argc, char **argv )
-{
-  uint8_t key[BLAKE2B_KEYBYTES];
-  uint8_t buf[KAT_LENGTH];
-
-  for( size_t i = 0; i < BLAKE2B_KEYBYTES; ++i )
-    key[i] = ( uint8_t )i;
-
-  for( size_t i = 0; i < KAT_LENGTH; ++i )
-    buf[i] = ( uint8_t )i;
-
-  for( size_t i = 0; i < KAT_LENGTH; ++i )
-  {
-    uint8_t hash[BLAKE2B_OUTBYTES];
-    blake2b( hash, buf, key, BLAKE2B_OUTBYTES, i, BLAKE2B_KEYBYTES );
-
-    if( 0 != memcmp( hash, blake2b_keyed_kat[i], BLAKE2B_OUTBYTES ) )
-    {
-      puts( "error" );
-      return -1;
-    }
-  }
-
-  puts( "ok" );
-  return 0;
-}
-#endif
-
diff --git a/cbits/blake2/blake2bp.c b/cbits/blake2/blake2bp.c
index 7948f6f..a6a4f4d 100644
--- a/cbits/blake2/blake2bp.c
+++ b/cbits/blake2/blake2bp.c
@@ -261,40 +261,3 @@ int blake2bp( uint8_t *out, const void *in, const void *key, uint8_t outlen, uin
 
   return blake2b_final( FS, out, outlen );
 }
-
-
-#if defined(BLAKE2BP_SELFTEST)
-#include <string.h>
-#include "blake2-kat.h"
-int main( int argc, char **argv )
-{
-  uint8_t key[BLAKE2B_KEYBYTES];
-  uint8_t buf[KAT_LENGTH];
-
-  for( size_t i = 0; i < BLAKE2B_KEYBYTES; ++i )
-    key[i] = ( uint8_t )i;
-
-  for( size_t i = 0; i < KAT_LENGTH; ++i )
-    buf[i] = ( uint8_t )i;
-
-  for( size_t i = 0; i < KAT_LENGTH; ++i )
-  {
-    uint8_t hash[BLAKE2B_OUTBYTES];
-    //blake2bp( hash, buf, key, BLAKE2B_OUTBYTES, i, BLAKE2B_KEYBYTES );
-    blake2bp_state S[1];
-    blake2bp_init_key( S, BLAKE2B_OUTBYTES, key, BLAKE2B_KEYBYTES );
-    blake2bp_update( S, buf, i );
-    blake2bp_final( S, hash, BLAKE2B_OUTBYTES );
-
-    if( 0 != memcmp( hash, blake2bp_keyed_kat[i], BLAKE2B_OUTBYTES ) )
-    {
-      puts( "error" );
-      return -1;
-    }
-  }
-
-  puts( "ok" );
-  return 0;
-}
-#endif
-
diff --git a/cbits/blake2/blake2s.c b/cbits/blake2/blake2s.c
index 6d9c252..67bfcc7 100644
--- a/cbits/blake2/blake2s.c
+++ b/cbits/blake2/blake2s.c
@@ -385,43 +385,3 @@ int blake2s( uint8_t *out, const void *in, const void *key, const uint8_t outlen
   blake2s_final( S, out, outlen );
   return 0;
 }
-
-#if defined(SUPERCOP)
-int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen )
-{
-  return blake2s( out, in, NULL, BLAKE2S_OUTBYTES, inlen, 0 );
-}
-#endif
-
-#if defined(BLAKE2S_SELFTEST)
-#include <string.h>
-#include "blake2-kat.h"
-int main( int argc, char **argv )
-{
-  uint8_t key[BLAKE2S_KEYBYTES];
-  uint8_t buf[KAT_LENGTH];
-
-  for( size_t i = 0; i < BLAKE2S_KEYBYTES; ++i )
-    key[i] = ( uint8_t )i;
-
-  for( size_t i = 0; i < KAT_LENGTH; ++i )
-    buf[i] = ( uint8_t )i;
-
-  for( size_t i = 0; i < KAT_LENGTH; ++i )
-  {
-    uint8_t hash[BLAKE2S_OUTBYTES];
-
-    if( blake2s( hash, buf, key, BLAKE2S_OUTBYTES, i, BLAKE2S_KEYBYTES ) < 0 ||
-        0 != memcmp( hash, blake2s_keyed_kat[i], BLAKE2S_OUTBYTES ) )
-    {
-      puts( "error" );
-      return -1;
-    }
-  }
-
-  puts( "ok" );
-  return 0;
-}
-#endif
-
-
diff --git a/cbits/blake2/blake2sp.c b/cbits/blake2/blake2sp.c
index 59fc9a4..3daf712 100644
--- a/cbits/blake2/blake2sp.c
+++ b/cbits/blake2/blake2sp.c
@@ -257,38 +257,3 @@ int blake2sp( uint8_t *out, const void *in, const void *key, uint8_t outlen, uin
 
   return blake2s_final( FS, out, outlen );
 }
-
-#if defined(BLAKE2SP_SELFTEST)
-#include <string.h>
-#include "blake2-kat.h"
-int main( int argc, char **argv )
-{
-  uint8_t key[BLAKE2S_KEYBYTES];
-  uint8_t buf[KAT_LENGTH];
-
-  for( size_t i = 0; i < BLAKE2S_KEYBYTES; ++i )
-    key[i] = ( uint8_t )i;
-
-  for( size_t i = 0; i < KAT_LENGTH; ++i )
-    buf[i] = ( uint8_t )i;
-
-  for( size_t i = 0; i < KAT_LENGTH; ++i )
-  {
-    uint8_t hash[BLAKE2S_OUTBYTES];
-    blake2sp( hash, buf, key, BLAKE2S_OUTBYTES, i, BLAKE2S_KEYBYTES );
-
-    if( 0 != memcmp( hash, blake2sp_keyed_kat[i], BLAKE2S_OUTBYTES ) )
-    {
-      puts( "error" );
-      return -1;
-    }
-  }
-
-  puts( "ok" );
-  return 0;
-}
-#endif
-
-
-
-