vboot: move vboot 2.1 functions and structs into host code

These structs and functions need to stick around for futility
to use, but they are no longer supported in firmware code.

Rename host/lib21/include/* files to end in 21 instead of 2.

BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none

Change-Id: I01e181e2f03553d60724fbdc826f5ada63777303
Cq-Depend: chromium:1969172
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1963621
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>

9 files changed, 19 insertions, 19 deletions

diff --git a/futility/cmd_create.c b/futility/cmd_create.c
index a3cb8b58..2f7a8d5f 100644
--- a/futility/cmd_create.c
+++ b/futility/cmd_create.c
@@ -16,12 +16,12 @@
 #include "2sysincludes.h"
 #include "futility.h"
 #include "futility_options.h"
-#include "host_key2.h"
+#include "host_common21.h"
 #include "host_key.h"
-#include "host_misc2.h"
+#include "host_key21.h"
+#include "host_misc21.h"
 #include "openssl_compat.h"
 #include "util_misc.h"
-#include "vb21_common.h"
 #include "vb2_common.h"
 
 /* Command line options */
diff --git a/futility/cmd_show.c b/futility/cmd_show.c
index 402b1330..f3b91631 100644
--- a/futility/cmd_show.c
+++ b/futility/cmd_show.c
@@ -28,7 +28,7 @@
 #include "futility.h"
 #include "futility_options.h"
 #include "host_common.h"
-#include "host_key2.h"
+#include "host_key21.h"
 #include "util_misc.h"
 #include "vb1_helper.h"
 #include "vb2_common.h"
diff --git a/futility/cmd_sign.c b/futility/cmd_sign.c
index 117a6536..980e6d12 100644
--- a/futility/cmd_sign.c
+++ b/futility/cmd_sign.c
@@ -18,17 +18,17 @@
 #include <unistd.h>
 
 #include "2common.h"
-#include "file_type_bios.h"
 #include "file_type.h"
+#include "file_type_bios.h"
 #include "fmap.h"
 #include "futility.h"
 #include "futility_options.h"
 #include "host_common.h"
-#include "host_key2.h"
+#include "host_common21.h"
+#include "host_key21.h"
 #include "kernel_blob.h"
 #include "util_misc.h"
 #include "vb1_helper.h"
-#include "vb21_common.h"
 #include "vb2_common.h"
 
 /* Options */
diff --git a/futility/cmd_vbutil_firmware.c b/futility/cmd_vbutil_firmware.c
index d5a86863..7659ed25 100644
--- a/futility/cmd_vbutil_firmware.c
+++ b/futility/cmd_vbutil_firmware.c
@@ -18,7 +18,7 @@
 #include "2sysincludes.h"
 #include "futility.h"
 #include "host_common.h"
-#include "host_key2.h"
+#include "host_key21.h"
 #include "kernel_blob.h"
 #include "util_misc.h"
 #include "vb1_helper.h"
diff --git a/futility/cmd_vbutil_key.c b/futility/cmd_vbutil_key.c
index b0b7675e..0d812540 100644
--- a/futility/cmd_vbutil_key.c
+++ b/futility/cmd_vbutil_key.c
@@ -14,7 +14,7 @@
 
 #include "futility.h"
 #include "host_common.h"
-#include "host_key2.h"
+#include "host_key21.h"
 #include "util_misc.h"
 #include "vb1_helper.h"
 #include "vb2_common.h"
diff --git a/futility/cmd_vbutil_keyblock.c b/futility/cmd_vbutil_keyblock.c
index 2be7a850..977b4aa4 100644
--- a/futility/cmd_vbutil_keyblock.c
+++ b/futility/cmd_vbutil_keyblock.c
@@ -16,7 +16,7 @@
 #include "2sysincludes.h"
 #include "futility.h"
 #include "host_common.h"
-#include "host_key2.h"
+#include "host_key21.h"
 #include "util_misc.h"
 #include "vb1_helper.h"
 #include "vb2_common.h"
diff --git a/futility/file_type_rwsig.c b/futility/file_type_rwsig.c
index bcccb2dd..a09782ce 100644
--- a/futility/file_type_rwsig.c
+++ b/futility/file_type_rwsig.c
@@ -23,11 +23,11 @@
 #include "futility.h"
 #include "futility_options.h"
 #include "host_common.h"
-#include "host_key2.h"
+#include "host_common21.h"
+#include "host_key21.h"
 #include "host_misc.h"
-#include "host_signature2.h"
+#include "host_signature21.h"
 #include "util_misc.h"
-#include "vb21_common.h"
 
 #define SIGNATURE_RSVD_SIZE 1024
 #define EC_RW_FILENAME "EC_RW.bin"
diff --git a/futility/file_type_usbpd1.c b/futility/file_type_usbpd1.c
index 42cb62cc..658b48c2 100644
--- a/futility/file_type_usbpd1.c
+++ b/futility/file_type_usbpd1.c
@@ -24,10 +24,10 @@
 #include "futility.h"
 #include "futility_options.h"
 #include "host_common.h"
-#include "host_key2.h"
-#include "host_signature2.h"
+#include "host_common21.h"
+#include "host_key21.h"
+#include "host_signature21.h"
 #include "util_misc.h"
-#include "vb21_common.h"
 
 /* Return 1 if okay, 0 if not */
 static int parse_size_opts(uint32_t len,
diff --git a/futility/vb2_helper.c b/futility/vb2_helper.c
index f5b7978e..fb0362ae 100644
--- a/futility/vb2_helper.c
+++ b/futility/vb2_helper.c
@@ -14,11 +14,11 @@
 #include "futility.h"
 #include "futility_options.h"
 #include "host_common.h"
-#include "host_key2.h"
-#include "host_misc2.h"
+#include "host_common21.h"
+#include "host_key21.h"
+#include "host_misc21.h"
 #include "openssl_compat.h"
 #include "util_misc.h"
-#include "vb21_common.h"
 
 int vb2_lookup_hash_alg(const char *str, enum vb2_hash_algorithm *alg)
 {