mirrors/minisign
1
0
Fork 0
mirror of https://github.com/jedisct1/minisign.git synced 2025-04-04 11:27:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Zero pad key id when printed

Browse source 
Make the representation of the key id always 16 hex characters long
This commit is contained in:
Pekka Ristola 2023-12-17 15:30:18 +02:00
parent 7d1116c5cc
commit 7dcd1bde14
No known key found for this signature in database
GPG key ID: 2C20BE716E05213E
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/minisign.c
View file

@ -1,6 +1,5 @@
#include <assert.h>
#include <inttypes.h>
#include <limits.h>
#include <stddef.h>
#include <stdint.h>
@ -461,9 +460,9 @@ verify(PubkeyStruct *pubkey_struct, const char *message_file, const char *sig_fi
if (memcmp(sig_struct->keynum, pubkey_struct->keynum_pk.keynum, sizeof sig_struct->keynum) !=
0) {
fprintf(stderr,
"Signature key id in %s is %" PRIX64
"Signature key id in %s is " KEYNUM_FMT
"\n"
"but the key id in the public key is %" PRIX64 "\n",
"but the key id in the public key is " KEYNUM_FMT "\n",
sig_file, le64_load(sig_struct->keynum),
le64_load(pubkey_struct->keynum_pk.keynum));
exit(1);
@ -662,7 +661,7 @@ write_pk_file(const char *pk_file, const PubkeyStruct *pubkey_struct)
if ((fp = fopen(pk_file, "w")) == NULL) {
exit_err(pk_file);
}
xfprintf(fp, COMMENT_PREFIX "minisign public key %" PRIX64 "\n",
xfprintf(fp, COMMENT_PREFIX "minisign public key " KEYNUM_FMT "\n",
le64_load(pubkey_struct->keynum_pk.keynum));
xfput_b64(fp, (const unsigned char *) (const void *) pubkey_struct, sizeof *pubkey_struct);
xfclose(fp);

3
src/minisign.h
View file

@ -2,6 +2,8 @@
#ifndef MINISIGN_H
#define MINISIGN_H 1
#include <inttypes.h>
#define COMMENTMAXBYTES 1024
#define KEYNUMBYTES 8
#define PASSWORDMAXBYTES 1024
@ -11,6 +13,7 @@
#define KDFALG "Sc"
#define KDFNONE "\0\0"
#define CHKALG "B2"
#define KEYNUM_FMT "%016" PRIX64
#define COMMENT_PREFIX "untrusted comment: "
#define DEFAULT_COMMENT "signature from minisign secret key"
#define SECRETKEY_DEFAULT_COMMENT "minisign encrypted secret key"