Fix warnings about missing return value checks.
In some harmless places, checks for the return value of ECDSA and RSA key generation and verification was omitted. Add them to keep the compiler happy and to warn end users in case something is wrong.
This commit is contained in:
parent
ab0576a203
commit
d8d1ab4ee1
4 changed files with 35 additions and 8 deletions
|
@ -335,7 +335,11 @@ int cmd_invite(int argc, char *argv[]) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
chmod(filename, 0600);
|
chmod(filename, 0600);
|
||||||
ecdsa_write_pem_private_key(key, f);
|
if(!ecdsa_write_pem_private_key(key, f)) {
|
||||||
|
fprintf(stderr, "Could not write ECDSA private key\n");
|
||||||
|
fclose(f);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
fclose(f);
|
fclose(f);
|
||||||
|
|
||||||
if(connect_tincd(false))
|
if(connect_tincd(false))
|
||||||
|
@ -704,6 +708,8 @@ make_names:
|
||||||
|
|
||||||
snprintf(filename, sizeof filename, "%s" SLASH "ed25519_key.priv", confbase);
|
snprintf(filename, sizeof filename, "%s" SLASH "ed25519_key.priv", confbase);
|
||||||
f = fopenmask(filename, "w", 0600);
|
f = fopenmask(filename, "w", 0600);
|
||||||
|
if(!f)
|
||||||
|
return false;
|
||||||
|
|
||||||
if(!ecdsa_write_pem_private_key(key, f)) {
|
if(!ecdsa_write_pem_private_key(key, f)) {
|
||||||
fprintf(stderr, "Error writing private key!\n");
|
fprintf(stderr, "Error writing private key!\n");
|
||||||
|
@ -725,10 +731,14 @@ make_names:
|
||||||
snprintf(filename, sizeof filename, "%s" SLASH "rsa_key.priv", confbase);
|
snprintf(filename, sizeof filename, "%s" SLASH "rsa_key.priv", confbase);
|
||||||
f = fopenmask(filename, "w", 0600);
|
f = fopenmask(filename, "w", 0600);
|
||||||
|
|
||||||
rsa_write_pem_private_key(rsa, f);
|
if(!f || !rsa_write_pem_private_key(rsa, f)) {
|
||||||
|
fprintf(stderr, "Could not write private RSA key\n");
|
||||||
|
} else if(!rsa_write_pem_public_key(rsa, fh)) {
|
||||||
|
fprintf(stderr, "Could not write public RSA key\n");
|
||||||
|
}
|
||||||
|
|
||||||
fclose(f);
|
fclose(f);
|
||||||
|
|
||||||
rsa_write_pem_public_key(rsa, fh);
|
|
||||||
fclose(fh);
|
fclose(fh);
|
||||||
|
|
||||||
rsa_free(rsa);
|
rsa_free(rsa);
|
||||||
|
|
|
@ -88,7 +88,10 @@ int main(int argc, char *argv[]) {
|
||||||
|
|
||||||
FILE *fp = fopen(argv[1], "w");
|
FILE *fp = fopen(argv[1], "w");
|
||||||
if(fp) {
|
if(fp) {
|
||||||
ecdsa_write_pem_private_key(key, fp);
|
if(!ecdsa_write_pem_private_key(key, fp)) {
|
||||||
|
fprintf(stderr, "Could not write ECDSA private key\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
} else {
|
} else {
|
||||||
fprintf(stderr, "Could not open '%s' for writing: %s\n", argv[1], strerror(errno));
|
fprintf(stderr, "Could not open '%s' for writing: %s\n", argv[1], strerror(errno));
|
||||||
|
@ -97,7 +100,8 @@ int main(int argc, char *argv[]) {
|
||||||
|
|
||||||
fp = fopen(argv[2], "w");
|
fp = fopen(argv[2], "w");
|
||||||
if(fp) {
|
if(fp) {
|
||||||
ecdsa_write_pem_public_key(key, fp);
|
if(!ecdsa_write_pem_public_key(key, fp))
|
||||||
|
fprintf(stderr, "Could not write ECDSA public key\n");
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
} else {
|
} else {
|
||||||
fprintf(stderr, "Could not open '%s' for writing: %s\n", argv[2], strerror(errno));
|
fprintf(stderr, "Could not open '%s' for writing: %s\n", argv[2], strerror(errno));
|
||||||
|
|
|
@ -102,19 +102,26 @@ int main(int argc, char *argv[]) {
|
||||||
|
|
||||||
fprintf(stderr, "Ed25519 sign for %lg seconds: ", duration);
|
fprintf(stderr, "Ed25519 sign for %lg seconds: ", duration);
|
||||||
for(clock_start(); clock_countto(duration);)
|
for(clock_start(); clock_countto(duration);)
|
||||||
ecdsa_sign(key1, buf1, 256, buf2);
|
if(!ecdsa_sign(key1, buf1, 256, buf2))
|
||||||
|
return 1;
|
||||||
fprintf(stderr, "%22.2lf op/s\n", rate);
|
fprintf(stderr, "%22.2lf op/s\n", rate);
|
||||||
|
|
||||||
fprintf(stderr, "Ed25519 verify for %lg seconds: ", duration);
|
fprintf(stderr, "Ed25519 verify for %lg seconds: ", duration);
|
||||||
for(clock_start(); clock_countto(duration);)
|
for(clock_start(); clock_countto(duration);)
|
||||||
ecdsa_verify(key1, buf1, 256, buf2);
|
if(!ecdsa_verify(key1, buf1, 256, buf2)) {
|
||||||
|
fprintf(stderr, "Signature verification failed\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
fprintf(stderr, "%20.2lf op/s\n", rate);
|
fprintf(stderr, "%20.2lf op/s\n", rate);
|
||||||
|
|
||||||
ecdh1 = ecdh_generate_public(buf1);
|
ecdh1 = ecdh_generate_public(buf1);
|
||||||
fprintf(stderr, "ECDH for %lg seconds: ", duration);
|
fprintf(stderr, "ECDH for %lg seconds: ", duration);
|
||||||
for(clock_start(); clock_countto(duration);) {
|
for(clock_start(); clock_countto(duration);) {
|
||||||
ecdh2 = ecdh_generate_public(buf2);
|
ecdh2 = ecdh_generate_public(buf2);
|
||||||
ecdh_compute_shared(ecdh2, buf1, buf3);
|
if(!ecdh2)
|
||||||
|
return 1;
|
||||||
|
if(!ecdh_compute_shared(ecdh2, buf1, buf3))
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
fprintf(stderr, "%28.2lf op/s\n", rate);
|
fprintf(stderr, "%28.2lf op/s\n", rate);
|
||||||
ecdh_free(ecdh1);
|
ecdh_free(ecdh1);
|
||||||
|
|
|
@ -233,6 +233,12 @@ FILE *fopenmask(const char *filename, const char *mode, mode_t perms) {
|
||||||
perms &= ~mask;
|
perms &= ~mask;
|
||||||
umask(~perms);
|
umask(~perms);
|
||||||
FILE *f = fopen(filename, mode);
|
FILE *f = fopen(filename, mode);
|
||||||
|
|
||||||
|
if(!f) {
|
||||||
|
fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef HAVE_FCHMOD
|
#ifdef HAVE_FCHMOD
|
||||||
if((perms & 0444) && f)
|
if((perms & 0444) && f)
|
||||||
fchmod(fileno(f), perms);
|
fchmod(fileno(f), perms);
|
||||||
|
|
Loading…
Reference in a new issue