X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fed25519%2Fecdsa.c;h=ec53c070f67f792838e45c5cd1549c89193ae2b7;hb=1797680356b8a9256fd233a126f0b4cae9d52b17;hp=a63dedab0597c16c59500fdc31a357af7c431b84;hpb=ae1d95cee66f3e5c6475f03b441d455e436e9ee8;p=meshlink diff --git a/src/ed25519/ecdsa.c b/src/ed25519/ecdsa.c index a63dedab..ec53c070 100644 --- a/src/ed25519/ecdsa.c +++ b/src/ed25519/ecdsa.c @@ -1,6 +1,6 @@ /* ecdsa.c -- ECDSA key handling - Copyright (C) 2014 Guus Sliepen + Copyright (C) 2014-2017 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -42,8 +42,9 @@ ecdsa_t *ecdsa_set_base64_public_key(const char *p) { return 0; } - ecdsa_t *ecdsa = xzalloc(sizeof *ecdsa); + ecdsa_t *ecdsa = xzalloc(sizeof * ecdsa); len = b64decode(p, ecdsa->public, len); + if(len != 32) { logger(NULL, MESHLINK_ERROR, "Invalid format of public key! len = %d", len); free(ecdsa); @@ -63,22 +64,29 @@ char *ecdsa_get_base64_public_key(ecdsa_t *ecdsa) { // Read PEM ECDSA keys ecdsa_t *ecdsa_read_pem_public_key(FILE *fp) { - ecdsa_t *ecdsa = xzalloc(sizeof *ecdsa); - if(fread(ecdsa->public, sizeof ecdsa->public, 1, fp) == 1) + ecdsa_t *ecdsa = xzalloc(sizeof * ecdsa); + + if(fread(ecdsa->public, sizeof ecdsa->public, 1, fp) == 1) { return ecdsa; + } + free(ecdsa); return 0; } ecdsa_t *ecdsa_read_pem_private_key(FILE *fp) { - ecdsa_t *ecdsa = xmalloc(sizeof *ecdsa); - if(fread(ecdsa, sizeof *ecdsa, 1, fp) == 1) + ecdsa_t *ecdsa = xmalloc(sizeof * ecdsa); + + if(fread(ecdsa, sizeof * ecdsa, 1, fp) == 1) { return ecdsa; + } + free(ecdsa); return 0; } size_t ecdsa_size(ecdsa_t *ecdsa) { + (void)ecdsa; return 64; }