X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fed25519%2Fecdsa.c;h=f0ce2c162709d732ca58a1bf1d50356e87787572;hb=421aa3815645b2835c89799e4db91cf35466542b;hp=4bd71556ee9efa06006e9b7e62260382f9c47dc6;hpb=1c475ecb575367a6b3f9328b0f643ad636155341;p=tinc diff --git a/src/ed25519/ecdsa.c b/src/ed25519/ecdsa.c index 4bd71556..f0ce2c16 100644 --- a/src/ed25519/ecdsa.c +++ b/src/ed25519/ecdsa.c @@ -35,18 +35,18 @@ typedef struct { // Get and set ECDSA keys // ecdsa_t *ecdsa_set_base64_public_key(const char *p) { - int len = strlen(p); + size_t len = strlen(p); if(len != 43) { - logger(DEBUG_ALWAYS, LOG_ERR, "Invalid size %d for public key!", len); + logger(DEBUG_ALWAYS, LOG_ERR, "Invalid size %lu for public key!", (unsigned long)len); return 0; } ecdsa_t *ecdsa = xzalloc(sizeof(*ecdsa)); - len = b64decode(p, ecdsa->public, len); + len = b64decode_tinc(p, ecdsa->public, len); if(len != 32) { - logger(DEBUG_ALWAYS, LOG_ERR, "Invalid format of public key! len = %d", len); + logger(DEBUG_ALWAYS, LOG_ERR, "Invalid format of public key! len = %lu", (unsigned long)len); free(ecdsa); return 0; } @@ -56,7 +56,7 @@ ecdsa_t *ecdsa_set_base64_public_key(const char *p) { char *ecdsa_get_base64_public_key(ecdsa_t *ecdsa) { char *base64 = xmalloc(44); - b64encode(ecdsa->public, base64, sizeof(ecdsa->public)); + b64encode_tinc(ecdsa->public, base64, sizeof(ecdsa->public)); return base64; } @@ -88,7 +88,7 @@ static bool read_pem(FILE *fp, const char *type, void *vbuf, size_t size) { } size_t linelen = strcspn(line, "\r\n"); - size_t len = b64decode(line, line, linelen); + size_t len = b64decode_tinc(line, line, linelen); if(!len) { logger(DEBUG_ALWAYS, LOG_ERR, "Invalid base64 data in PEM file\n");