Update rma_reset command line interface.

Usage: rma_reset --key_id <arg> --board_id <arg> --device_id <arg>
                                   --hw_id <arg> | --auth_code <arg>

These value are used for generating the challenge response and all are
                                                              mandatory.
-k,--key_id         Index of the server private key
-b,--board_id     BoardID type field
-d,--device_id    Device-unique identifier
-w,--hw_id         Hardware id

The -t parameter, not listed, will use the default values to generate
                                                the challenge response

This value is the authorization code and any other parameters are ignored
-a,--auth_code    Reset authorization code

BUG=b:37952913
BRANCH=none
TEST=make buildall
Signed-off-by: Sam Hurst <shurst@chromium.org>

Change-Id: Idc916b123928328a3425fa4eee22afc2ec179fc1
Reviewed-on: https://chromium-review.googlesource.com/665388
Commit-Ready: Sam Hurst <shurst@google.com>
Commit-Ready: Vadim Bendebury <vbendeb@chromium.org>
Tested-by: Sam Hurst <shurst@google.com>
Reviewed-by: Michael Tang <ntang@chromium.org>

1 files changed, 285 insertions, 45 deletions

diff --git a/extra/rma_reset/rma_reset.c b/extra/rma_reset/rma_reset.c
index 0c72894f13..f86eff878d 100644
--- a/extra/rma_reset/rma_reset.c
+++ b/extra/rma_reset/rma_reset.c
@@ -3,17 +3,24 @@
  * found in the LICENSE file.
  */
 
+#include <ctype.h>
+#include <endian.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <getopt.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #define __packed __attribute__((packed))
 #include "rma_auth.h"
 #include "curve25519.h"
 #include "sha256.h"
 #include "base32.h"
 
-#define SERVER_ADDRESS	"https://www.google.com/chromeos/partner/console/cr50reset/request"
+#define SERVER_ADDRESS \
+	"https://www.google.com/chromeos/partner/console/cr50reset/request"
 
 /* Server public key and key ID */
 static uint8_t server_pri_key[32] = RMA_TEST_SERVER_PRIVATE_KEY;
@@ -21,10 +28,25 @@ static uint8_t server_pub_key[32] = RMA_TEST_SERVER_PUBLIC_KEY;
 static uint8_t server_key_id = RMA_TEST_SERVER_KEY_ID;
 static uint8_t board_id[4] = {'Z', 'Z', 'C', 'R'};
 static uint8_t device_id[8] = {'T', 'H', 'X', 1, 1, 3, 8, 0xfe};
+static uint8_t hw_id[20] = "TESTSAMUS1234";
 
 static char challenge[RMA_CHALLENGE_BUF_SIZE];
 static char authcode[RMA_AUTHCODE_BUF_SIZE];
 
+static char *progname;
+static char *short_opts = "k:b:d:a:w:th";
+static const struct option long_opts[] = {
+	/* name    hasarg *flag val */
+	{"key_id",     1,   NULL, 'k'},
+	{"board_id",   1,   NULL, 'b'},
+	{"device_id",  1,   NULL, 'd'},
+	{"auth_code",  1,   NULL, 'a'},
+	{"hw_id",      1,   NULL, 'w'},
+	{"test",       0,   NULL, 't'},
+	{"help",       0,   NULL, 'h'},
+	{},
+};
+
 void panic_assert_fail(const char *fname, int linenum);
 void rand_bytes(void *buffer, size_t len);
 int safe_memcmp(const void *s1, const void *s2, size_t size);
@@ -116,66 +138,284 @@ static void print_params(void)
 {
 	int i;
 
-	printf("\nBoard Id:\n");
-	for (i = 0; i < 4; i++)
-		printf("%c ", board_id[i]);
-
-	printf("\n\nDevice Id:\n");
-	for (i = 0; i < 3; i++)
-		printf("%c ", device_id[i]);
-	for (i = 3; i < 8; i++)
-		printf("%02x ", device_id[i]);
-
-	printf("\n\nServer Key Id:\n");
-	printf("%02x", server_key_id);
-
-	printf("\n\nServer Private Key:\n");
-	for (i = 0; i < 32; i++)
-		printf("%02x%c", server_pri_key[i], ((i + 1) % 8) ? ' ':'\n');
-
-	printf("\nServer Public Key:\n");
-	for (i = 0; i < 32; i++)
-		printf("%02x%c", server_pub_key[i], ((i + 1) % 8) ? ' ':'\n');
+	{ /* For Testing only */
+		printf("\nBoard Id:\n");
+		for (i = 0; i < 4; i++)
+			printf("%c ", board_id[i]);
+
+		printf("\n\nDevice Id:\n");
+		for (i = 0; i < 3; i++)
+			printf("%c ", device_id[i]);
+		for (i = 3; i < 8; i++)
+			printf("%02x ", device_id[i]);
+
+		printf("\n\nServer Key Id:\n");
+		printf("%02x", server_key_id);
+
+		printf("\n\nServer Private Key:\n");
+		for (i = 0; i < 32; i++)
+			printf("%02x%c", server_pri_key[i], ((i + 1) % 8)
+								? ' ':'\n');
+
+		printf("\nServer Public Key:\n");
+		for (i = 0; i < 32; i++)
+			printf("%02x%c", server_pub_key[i], ((i + 1) % 8)
+								? ' ':'\n');
+
+		printf("\nChallenge:\n");
+		for (i = 0; i < RMA_CHALLENGE_CHARS; i++) {
+			printf("%c", challenge[i]);
+			if (((i + 1) % 5) == 0)
+				printf(" ");
+			if (((i + 1) % 40) == 0)
+				printf("\n");
+		}
 
-	printf("\nChallenge:\n");
-	for (i = 0; i < RMA_CHALLENGE_CHARS; i++) {
-		printf("%c", challenge[i]);
-		if (((i + 1) % 5) == 0)
-			printf(" ");
-		if (((i + 1) % 40) == 0)
-			printf("\n");
+		printf("\nAuthorization Code:\n");
+		for (i = 0; i < RMA_AUTHCODE_BUF_SIZE; i++)
+			printf("%c", authcode[i]);
 	}
 
-	printf("\nAuthorization Code:\n");
-	for (i = 0; i < RMA_AUTHCODE_BUF_SIZE; i++)
-		printf("%c", authcode[i]);
-
 	printf("\n\nChallenge String:\n");
 	printf("%s?challenge=", SERVER_ADDRESS);
 	for (i = 0; i < RMA_CHALLENGE_CHARS; i++)
 		printf("%c", challenge[i]);
-	printf("&hwid=HWIDTEST2082\n");
+	printf("&hwid=%s\n", hw_id);
 
 	printf("\n");
 }
 
+static void usage(void)
+{
+	printf("\nUsage: %s --key_id <arg> --board_id <arg> --device_id <arg>"
+					"--hw_id <arg> | --auth_code <arg>\n"
+		"\n"
+		"This generates a challenge response and "
+		"sends authoriztion code to reset device.\n"
+		"\n"
+		"  -k,--key_id       Index of the server private key\n"
+		"  -b,--board_id     BoardID type field\n"
+		"  -d,--device_id    Device-unique identifier\n"
+		"  -a,--auth_code    Reset authorization code\n"
+		"  -w,--hw_id        Hardware id\n"
+		"  -h,--help         Show this message\n"
+		"\n", progname);
+}
+
+static int atoh(char *v)
+{
+	char hn;
+	char ln;
+
+	hn = toupper(*v);
+	ln = toupper(*(v + 1));
+
+	hn -= (isdigit(hn) ? '0' : '7');
+	ln -= (isdigit(ln) ? '0' : '7');
+
+	if ((hn < 0 || hn > 0xf) || (ln < 0 || ln > 0xf))
+		return 0;
+
+	return (hn << 4) | ln;
+}
+
+static int set_server_key_id(char *id)
+{
+	/* verify length */
+	if (strlen(id) != 2)
+		return 1;
+
+	/* verify digits */
+	if (!isxdigit(*id) || !isxdigit(*(id+1)))
+		return 1;
+
+	server_key_id = atoh(id);
+
+	return 0;
+}
+
+static int set_board_id(char *id)
+{
+	int i;
+
+	/* verify length */
+	if (strlen(id) != 8)
+		return 1;
+
+	/* verify digits */
+	for (i = 0; i < 8; i++)
+		if (!isxdigit(*(id + i)))
+			return 1;
+
+	for (i = 0; i < 4; i++)
+		board_id[i] = atoh((id + (i*2)));
+
+	return 0;
+}
+
+static int set_device_id(char *id)
+{
+	int i;
+
+	/* verify length */
+	if (strlen(id) != 16)
+		return 1;
+
+	for (i = 0; i < 16; i++)
+		if (!isxdigit(*(id + i)))
+			return 1;
+
+	for (i = 0; i < 8; i++)
+		device_id[i] = atoh((id + (i*2)));
+
+	return 0;
+}
+
+static int set_hw_id(char *id)
+{
+	int i;
+	int len;
+
+	len = strlen(id);
+	if (len > 20)
+		len = 20;
+
+	for (i = 0; i < 20; i++)
+		hw_id[i] = *(id + i);
+
+	return 0;
+}
+
+static int set_auth_code(char *code)
+{
+	int i;
+
+	if (strlen(code) != 8)
+		return 1;
+
+	for (i = 0; i < 8; i++)
+		authcode[i] = *(code + i);
+	authcode[i] = 0;
+
+	return 0;
+}
+
 int main(int argc, char **argv)
 {
-	char code[25];
-	int ret;
+	int a_flag = 0;
+	int k_flag = 0;
+	int b_flag = 0;
+	int d_flag = 0;
+	int w_flag = 0;
+	int t_flag = 0;
+	int i;
 
-	rma_create_challenge();
-	print_params();
+	progname = strrchr(argv[0], '/');
+	if (progname)
+		progname++;
+	else
+		progname = argv[0];
+
+	opterr = 0;
+	while ((i = getopt_long(argc, argv, short_opts, long_opts, 0)) != -1) {
+		switch (i) {
+		case 't':
+			t_flag = 1;
+			break;
+		case 'k':
+			if (set_server_key_id(optarg)) {
+				printf("Malformed key id\n");
+				return 1;
+			}
+			k_flag = 1;
+			break;
+		case 'b':
+			if (set_board_id(optarg)) {
+				printf("Malformed board id\n");
+				return 1;
+			}
+			b_flag = 1;
+			break;
+		case 'd':
+			if (set_device_id(optarg)) {
+				printf("Malformed device id\n");
+				return 1;
+			}
+			d_flag = 1;
+			break;
+		case 'a':
+			if (set_auth_code(optarg)) {
+				printf("Malformed authorization code\n");
+				return 1;
+			}
+			a_flag = 1;
+			break;
+		case 'w':
+			if (set_hw_id(optarg)) {
+				printf("Malformed hardware id\n");
+				return 1;
+			}
+			w_flag = 1;
+		case 'h':
+			usage();
+			return 0;
+		case 0:                         /* auto-handled option */
+			break;
+		case '?':
+			if (optopt)
+				printf("Unrecognized option: -%c\n", optopt);
+			else
+				printf("Unrecognized option: %s\n",
+							argv[optind - 1]);
+			break;
+		case ':':
+			printf("Missing argument to %s\n", argv[optind - 1]);
+			break;
+		default:
+			printf("Internal error at %s:%d\n", __FILE__, __LINE__);
+			return 1;
+		}
+	}
 
-	do {
-		printf("Enter Authorization Code: ");
-		fgets(code, 25, stdin);
-		ret = rma_try_authcode(code);
-		if (ret != 0)
-			printf("\n\nCode is invalid\n\n");
-	} while (ret != 0);
+	if (a_flag) {
+		FILE *acode;
+		char verify_authcode[RMA_AUTHCODE_BUF_SIZE];
 
-	printf("Code Accepted\n");
+		acode = fopen("/tmp/authcode", "r");
+		if (acode == NULL) {
+			printf("Please generate challenge\n");
+			return 1;
+		}
+
+		fread(verify_authcode, 1, RMA_AUTHCODE_BUF_SIZE, acode);
+		if (strcmp(verify_authcode, authcode) == 0)
+			printf("Code Accepted\n");
+		else
+			printf("Invalid Code\n");
+
+	} else {
+		if (!t_flag) { /* Use default values */
+			if (!k_flag || !b_flag || !d_flag || !w_flag) {
+				printf("Flags -k, -b, -d, and -w are "
+							"mandiatory\n");
+				return 1;
+			}
+		}
+
+		rma_create_challenge();
+
+		{
+			FILE *acode;
+
+			acode = fopen("/tmp/authcode", "w");
+			if (acode < 0)
+				return 1;
+			fwrite(authcode, 1, RMA_AUTHCODE_BUF_SIZE, acode);
+			fclose(acode);
+		}
+
+		print_params();
+	}
 
 	return 0;
 }