From 61d037ae316217c7e2491835a7a837a8f16db3a4 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Wed, 9 Mar 2022 13:36:47 -0500
Subject: [PATCH] Combine genpasshmac with clortho

This permits saving on addons size by using the same
binary for both networked api grant and hmac api
grant.
---
 confluent_osdeploy/utils/Makefile  |  6 +----
 confluent_osdeploy/utils/clortho.c | 39 ++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/confluent_osdeploy/utils/Makefile b/confluent_osdeploy/utils/Makefile
index 136830cf..a8796fd4 100644
--- a/confluent_osdeploy/utils/Makefile
+++ b/confluent_osdeploy/utils/Makefile
@@ -2,7 +2,7 @@ CC := gcc
 CFLAGS := -Os
 TARGETS := copernicus autocons start_root confluent_imginfo
 
-all: $(TARGETS) clortho urlmount genpasshmac
+all: $(TARGETS) clortho urlmount
 
 urlmount: urlmount.c
 	$(CC) $(CFLAGS) -o $@ $^  -D_FILE_OFFSET_BITS=64  -lcurl -lm -lfuse -lpthread
@@ -12,10 +12,6 @@ clortho: clortho.c sha-256.c
 	$(CC) $(CFLAGS) -o $@ $^ -lcrypt
 	strip -s $@
 
-genpasshmac: genpasshmac.c sha-256.c
-	$(CC) $(CFLAGS) -o $@ $^ -lcrypt
-	strip -s $@
-
 $(TARGETS): % : %.c
 	$(CC) $(CFLAGS) -o $@ $^
 	strip -s $@
diff --git a/confluent_osdeploy/utils/clortho.c b/confluent_osdeploy/utils/clortho.c
index c409a9fc..1cae1194 100644
--- a/confluent_osdeploy/utils/clortho.c
+++ b/confluent_osdeploy/utils/clortho.c
@@ -39,6 +39,42 @@ unsigned char* genpasswd(int len) {
 
 }
 
+int getpasshmac(int argc, char* argv[]) {
+    FILE *outfile;
+    uint8_t *passwd;
+    uint8_t *buffer;
+    uint8_t *tmps;
+    uint8_t *cryptpass;
+    uint8_t hmac[32];
+    uint8_t hmackey[64];
+    int hmackeysize;
+    if (argc < 5) {
+        fprintf(stderr, "Usage: %s passfile cryptfile hmacfile hmackey\n", argv[0]);
+        exit(1);
+    }
+    outfile = fopen(argv[4], "r");
+    hmackeysize = fread(hmackey, 1, 64, outfile);
+    fclose(outfile);
+    passwd = genpasswd(48);
+    outfile = fopen(argv[1], "w");
+    buffer = malloc(20);
+    tmps = genpasswd(16);
+    memcpy(buffer, "$5$", 3);
+    memcpy(buffer + 3, tmps, 16);
+    buffer[19] = 0;
+    fwrite(passwd, 1, 48, outfile);
+    fclose(outfile);
+    cryptpass = crypt(passwd, buffer);
+    outfile = fopen(argv[2], "w");
+    fwrite(cryptpass, 1, strlen(cryptpass), outfile);
+    fclose(outfile);
+    hmac_sha256(hmac, cryptpass, strlen(cryptpass), hmackey, hmackeysize);
+    outfile = fopen(argv[3], "w");
+    fwrite(hmac, 1, 32, outfile);
+    fclose(outfile);
+    free(passwd);
+    free(buffer);
+}
 
 int main(int argc, char* argv[]) {
         int sock, ret;
@@ -64,6 +100,9 @@ int main(int argc, char* argv[]) {
         memset(&net6bind, 0, sizeof(struct sockaddr_in6));
         memset(&buffer, 0, MAXPACKET);
         memset(&timeout, 0, sizeof(struct timeval));
+        if (strstr(argv[0], "genpasshmac") != NULL) {
+            return getpasshmac(argc, argv);
+        }
         timeout.tv_sec = 10;
         net4bind.sin_port = htons(302);
         net4bind.sin_family = AF_INET;