vboot: Remove the remainder of vb1 cryptolib

At this point, all that's left are a few constants in the cryptolib
header files, and they're only used by host-side code.  So move them to
a host-side header file and get rid of cryptolib.

BUG=chromium:611535
BRANCH=none
TEST=make runtests; emerge-kevin coreboot depthcharge

Change-Id: I2235f0e84e13fef313afe54e749b73744b157884
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/400903
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>

12 files changed, 0 insertions, 13 deletions

diff --git a/host/lib/file_keys.c b/host/lib/file_keys.c
index 24c794f1..0aba6b86 100644
--- a/host/lib/file_keys.c
+++ b/host/lib/file_keys.c
@@ -17,7 +17,6 @@
 
 #include "2common.h"
 #include "2sha.h"
-#include "cryptolib.h"
 #include "file_keys.h"
 #include "host_common.h"
 #include "signature_digest.h"
diff --git a/host/lib/host_common.c b/host/lib/host_common.c
index a741fd96..c3ba044e 100644
--- a/host/lib/host_common.c
+++ b/host/lib/host_common.c
@@ -12,7 +12,6 @@
 #include "2rsa.h"
 #include "host_common.h"
 #include "host_key2.h"
-#include "cryptolib.h"
 #include "utility.h"
 #include "vb2_common.h"
 #include "vboot_common.h"
diff --git a/host/lib/host_key.c b/host/lib/host_key.c
index c0a0fdd6..10efc766 100644
--- a/host/lib/host_key.c
+++ b/host/lib/host_key.c
@@ -17,9 +17,7 @@
 #include "2common.h"
 #include "2rsa.h"
 #include "2sha.h"
-#include "cryptolib.h"
 #include "host_common.h"
-#include "host_key.h"
 #include "host_misc.h"
 #include "vb2_common.h"
 #include "vboot_common.h"
diff --git a/host/lib/host_key2.c b/host/lib/host_key2.c
index 7e505761..302bffee 100644
--- a/host/lib/host_key2.c
+++ b/host/lib/host_key2.c
@@ -17,7 +17,6 @@
 #include "2common.h"
 #include "2rsa.h"
 #include "2sha.h"
-#include "cryptolib.h"
 #include "host_common.h"
 #include "host_key.h"
 #include "host_key2.h"
diff --git a/host/lib/host_keyblock.c b/host/lib/host_keyblock.c
index dde8fe6c..fad17df4 100644
--- a/host/lib/host_keyblock.c
+++ b/host/lib/host_keyblock.c
@@ -13,7 +13,6 @@
 #include "2common.h"
 #include "2rsa.h"
 #include "2sha.h"
-#include "cryptolib.h"
 #include "host_common.h"
 #include "host_key.h"
 #include "host_key2.h"
diff --git a/host/lib/host_misc.c b/host/lib/host_misc.c
index 03d05664..611253b9 100644
--- a/host/lib/host_misc.c
+++ b/host/lib/host_misc.c
@@ -12,7 +12,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "cryptolib.h"
 #include "host_common.h"
 #include "vboot_common.h"
 
diff --git a/host/lib/host_signature2.c b/host/lib/host_signature2.c
index 8925e6a7..a9d0f44f 100644
--- a/host/lib/host_signature2.c
+++ b/host/lib/host_signature2.c
@@ -18,7 +18,6 @@
 #include "2common.h"
 #include "2rsa.h"
 #include "2sha.h"
-#include "cryptolib.h"
 #include "file_keys.h"
 #include "host_common.h"
 #include "host_key2.h"
diff --git a/host/lib/include/file_keys.h b/host/lib/include/file_keys.h
index 0879c311..b4bdd322 100644
--- a/host/lib/include/file_keys.h
+++ b/host/lib/include/file_keys.h
@@ -8,7 +8,6 @@
 #ifndef VBOOT_REFERENCE_FILE_KEYS_H_
 #define VBOOT_REFERENCE_FILE_KEYS_H_
 
-#include "cryptolib.h"
 #include "2sha.h"
 
 /* Calculates the appropriate digest for the data in [input_file] based on the
diff --git a/host/lib/include/host_common.h b/host/lib/include/host_common.h
index 8c14942e..7a347a8f 100644
--- a/host/lib/include/host_common.h
+++ b/host/lib/include/host_common.h
@@ -14,7 +14,6 @@
  */
 #define _STUB_IMPLEMENTATION_
 
-#include "cryptolib.h"
 #include "host_key.h"
 #include "host_key2.h"
 #include "host_keyblock.h"
diff --git a/host/lib/include/host_signature.h b/host/lib/include/host_signature.h
index 4fb94d60..fce664da 100644
--- a/host/lib/include/host_signature.h
+++ b/host/lib/include/host_signature.h
@@ -8,7 +8,6 @@
 #ifndef VBOOT_REFERENCE_HOST_SIGNATURE_H_
 #define VBOOT_REFERENCE_HOST_SIGNATURE_H_
 
-#include "cryptolib.h"
 #include "host_key.h"
 #include "utility.h"
 #include "vboot_struct.h"
diff --git a/host/lib/signature_digest.c b/host/lib/signature_digest.c
index 2050d4a4..d56b05be 100644
--- a/host/lib/signature_digest.c
+++ b/host/lib/signature_digest.c
@@ -14,7 +14,6 @@
 #include "2common.h"
 #include "2rsa.h"
 #include "2sha.h"
-#include "cryptolib.h"
 #include "host_common.h"
 #include "host_signature2.h"
 #include "signature_digest.h"
diff --git a/host/lib/util_misc.c b/host/lib/util_misc.c
index 56d21b38..95acecb9 100644
--- a/host/lib/util_misc.c
+++ b/host/lib/util_misc.c
@@ -17,7 +17,6 @@
 
 #include "2common.h"
 #include "2sha.h"
-#include "cryptolib.h"
 #include "host_common.h"
 #include "util_misc.h"
 #include "vb2_common.h"