kris/xmss-KAT-generator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4 from jamathews/master

Browse Source 
Read OIDs in big-endian byte order in UI
This commit is contained in:
Joost Rijneveld 2018-02-16 11:31:08 +01:00 committed by GitHub
commit 06281e057d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/keypair.c
View File

@ -17,7 +17,8 @@
int main(int argc, char **argv)
{
xmss_params params;
uint32_t oid;
uint32_t oid = 0;
int parse_oid_result = 0;
if (argc != 2) {
fprintf(stderr, "Expected parameter string (e.g. 'XMSS-SHA2_10_256')"
@ -27,7 +28,11 @@ int main(int argc, char **argv)
}
XMSS_STR_TO_OID(&oid, argv[1]);
XMSS_PARSE_OID(&params, oid);
parse_oid_result = XMSS_PARSE_OID(&params, oid);
if (parse_oid_result != 0) {
fprintf(stderr, "Error parsing oid.\n");
return parse_oid_result;
}
unsigned char pk[XMSS_OID_LEN + params.pk_bytes];
unsigned char sk[XMSS_OID_LEN + params.sk_bytes];
@ -38,4 +43,6 @@ int main(int argc, char **argv)
fwrite(sk, 1, XMSS_OID_LEN + params.sk_bytes, stdout);
fclose(stdout);
return 0;
}

17
ui/open.c
View File

@ -3,6 +3,7 @@
#include "../params.h"
#include "../xmss.h"
#include "../utils.h"
#ifdef XMSSMT
#define XMSS_PARSE_OID xmssmt_parse_oid
@ -17,7 +18,9 @@ int main(int argc, char **argv) {
FILE *sm_file;
xmss_params params;
uint32_t oid;
uint32_t oid = 0;
uint8_t buffer[XMSS_OID_LEN];
int parse_oid_result;
unsigned long long smlen;
int ret;
@ -39,6 +42,7 @@ int main(int argc, char **argv) {
sm_file = fopen(argv[2], "rb");
if (sm_file == NULL) {
fprintf(stderr, "Could not open signature + message file.\n");
fclose(keypair_file);
return -1;
}
@ -46,8 +50,15 @@ int main(int argc, char **argv) {
fseek(sm_file, 0, SEEK_END);
smlen = ftell(sm_file);
fread(&oid, 1, XMSS_OID_LEN, keypair_file);
XMSS_PARSE_OID(&params, oid);
fread(&buffer, 1, XMSS_OID_LEN, keypair_file);
oid = (uint32_t)bytes_to_ull(buffer, XMSS_OID_LEN);
parse_oid_result = XMSS_PARSE_OID(&params, oid);
if (parse_oid_result != 0) {
fprintf(stderr, "Error parsing oid.\n");
fclose(keypair_file);
fclose(sm_file);
return parse_oid_result;
}
unsigned char pk[XMSS_OID_LEN + params.pk_bytes];
unsigned char *sm = malloc(smlen);

31
ui/sign.c
View File

@ -3,6 +3,7 @@
#include "../params.h"
#include "../xmss.h"
#include "../utils.h"
#ifdef XMSSMT
#define XMSS_PARSE_OID xmssmt_parse_oid
@ -17,8 +18,10 @@ int main(int argc, char **argv) {
FILE *m_file;
xmss_params params;
uint32_t oid_pk;
uint32_t oid_sk;
uint32_t oid_pk = 0;
uint32_t oid_sk = 0;
uint8_t buffer[XMSS_OID_LEN];
int parse_oid_result;
unsigned long long mlen;
@ -39,6 +42,7 @@ int main(int argc, char **argv) {
m_file = fopen(argv[2], "rb");
if (m_file == NULL) {
fprintf(stderr, "Could not open message file.\n");
fclose(keypair_file);
return -1;
}
@ -47,14 +51,29 @@ int main(int argc, char **argv) {
mlen = ftell(m_file);
/* Read the OID from the public key, as we need its length to seek past it */
fread(&oid_pk, 1, XMSS_OID_LEN, keypair_file);
XMSS_PARSE_OID(&params, oid_pk);
fread(&buffer, 1, XMSS_OID_LEN, keypair_file);
/* The XMSS_OID_LEN bytes in buffer are a big-endian uint32. */
oid_pk = (uint32_t)bytes_to_ull(buffer, XMSS_OID_LEN);
parse_oid_result = XMSS_PARSE_OID(&params, oid_pk);
if (parse_oid_result != 0) {
fprintf(stderr, "Error parsing public key oid.\n");
fclose(keypair_file);
fclose(m_file);
return parse_oid_result;
}
/* fseek past the public key */
fseek(keypair_file, params.pk_bytes, SEEK_CUR);
/* This is the OID we're actually going to use. Likely the same, but still. */
fread(&oid_sk, 1, XMSS_OID_LEN, keypair_file);
XMSS_PARSE_OID(&params, oid_sk);
fread(&buffer, 1, XMSS_OID_LEN, keypair_file);
oid_sk = (uint32_t)bytes_to_ull(buffer, XMSS_OID_LEN);
parse_oid_result = XMSS_PARSE_OID(&params, oid_sk);
if (parse_oid_result != 0) {
fprintf(stderr, "Error parsing secret key oid.\n");
fclose(keypair_file);
fclose(m_file);
return parse_oid_result;
}
unsigned char sk[XMSS_OID_LEN + params.sk_bytes];
unsigned char *m = malloc(mlen);