Always pad fingerprints to 16 characters

[project/usign.git] / main.c

diff --git a/main.c b/main.c
index a1ed6c375431b3fbfcac6db6c11f44069d8a51a5..ebfdfb0809c4d8394b2254625d47649975d72000 100644 (file)
--- a/main.c
+++ b/main.c
@@ -129,13 +129,14 @@ get_file(const char *filename, char *buf, int buflen)
 
        len = fread(buf, 1, buflen - 1, f);
        buf[len] = 0;
+       fclose(f);
 }
 
 static bool
 get_base64_file(const char *file, void *dest, int size, void *buf, int buflen)
 {
        get_file(file, buf, buflen - 1);
-       return b64_pton(buf, dest, size) == size;
+       return b64_decode(buf, dest, size) == size;
 }
 
 static void write_file(const char *name, const uint8_t *fingerprint,
@@ -148,7 +149,7 @@ static void write_file(const char *name, const uint8_t *fingerprint,
        if (comment)
                fputs(comment, f);
        else
-               fprintf(f, "%s %"PRIx64, prefix,
+               fprintf(f, "%s %016"PRIx64, prefix,
                        fingerprint_u64(fingerprint));
        fprintf(f, "\n%s\n", buf);
        fclose(f);
@@ -171,11 +172,12 @@ static int verify(const char *msgfile)
        if (!get_base64_file(sigfile, &sig, sizeof(sig), buf, sizeof(buf)) ||
            memcmp(sig.pkalg, "Ed", 2) != 0) {
                fprintf(stderr, "Failed to decode signature\n");
+               fclose(f);
                return 1;
        }
 
        if (!pubkeyfile) {
-               snprintf(buf, sizeof(buf), "%s/%"PRIx64, pubkeydir,
+               snprintf(buf, sizeof(buf), "%s/%016"PRIx64, pubkeydir,
                         fingerprint_u64(sig.fingerprint));
                pubkeyfile = buf;
        }
@@ -183,6 +185,7 @@ static int verify(const char *msgfile)
        if (!get_base64_file(pubkeyfile, &pkey, sizeof(pkey), buf, sizeof(buf)) ||
            memcmp(pkey.pkalg, "Ed", 2) != 0) {
                fprintf(stderr, "Failed to decode public key\n");
+               fclose(f);
                return 1;
        }
 
@@ -245,7 +248,7 @@ static int sign(const char *msgfile)
        munmap(m, mlen);
        close(mfd);
 
-       if (b64_ntop(&sig, sizeof(sig), buf, sizeof(buf)) < 0)
+       if (b64_encode(&sig, sizeof(sig), buf, sizeof(buf)) < 0)
                return 1;
 
        write_file(sigfile, sig.fingerprint, "signed by key", buf);
@@ -273,7 +276,7 @@ static int fingerprint(void)
        else
                return 1;
 
-       fprintf(stdout, "%"PRIx64"\n", fingerprint_u64(fp));
+       fprintf(stdout, "%016"PRIx64"\n", fingerprint_u64(fp));
        return 0;
 }
 
@@ -292,11 +295,16 @@ static int generate(void)
        FILE *f;
 
        f = fopen("/dev/urandom", "r");
-       if (!f ||
-           fread(skey.fingerprint, sizeof(skey.fingerprint), 1, f) != 1 ||
+       if (!f) {
+               fprintf(stderr, "Can't open /dev/urandom\n");
+               return 1;
+       }
+
+       if (fread(skey.fingerprint, sizeof(skey.fingerprint), 1, f) != 1 ||
            fread(skey.seckey, EDSIGN_SECRET_KEY_SIZE, 1, f) != 1 ||
            fread(skey.salt, sizeof(skey.salt), 1, f) != 1) {
                fprintf(stderr, "Can't read data from /dev/urandom\n");
+               fclose(f);
                return 1;
        }
        if (f)
@@ -309,18 +317,18 @@ static int generate(void)
        sha512_add(&s, skey.seckey, sizeof(skey.seckey));
        memcpy(skey.checksum, sha512_final_get(&s), sizeof(skey.checksum));
 
-       if (b64_ntop(&skey, sizeof(skey), buf, sizeof(buf)) < 0)
+       if (b64_encode(&skey, sizeof(skey), buf, sizeof(buf)) < 0)
                return 1;
 
-       write_file(seckeyfile, skey.fingerprint, "public key", buf);
+       write_file(seckeyfile, skey.fingerprint, "private key", buf);
 
        memcpy(pkey.fingerprint, skey.fingerprint, sizeof(pkey.fingerprint));
        memcpy(pkey.pubkey, skey.seckey + 32, sizeof(pkey.pubkey));
 
-       if (b64_ntop(&pkey, sizeof(pkey), buf, sizeof(buf)) < 0)
+       if (b64_encode(&pkey, sizeof(pkey), buf, sizeof(buf)) < 0)
                return 1;
 
-       write_file(pubkeyfile, pkey.fingerprint, "private key", buf);
+       write_file(pubkeyfile, pkey.fingerprint, "public key", buf);
 
        return 0;
 }
@@ -333,7 +341,7 @@ static int usage(const char *cmd)
                "  -V:                  verify (needs at least -m and -p|-P)\n"
                "  -S:                  sign (needs at least -m and -s)\n"
                "  -F:                  print key fingerprint of public/secret key or signature\n"
-               "  -G:                  generate a new keypair\n"
+               "  -G:                  generate a new keypair (needs at least -p and -s)\n"
                "Options:\n"
                "  -c <comment>:        add comment to keys\n"
                "  -m <file>:           message file\n"