X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fkeys.c;h=2db2b1591655d687dec4e32e89310eead238d2c2;hb=8cb4dbb04af15e95e9a302670a4c6fd21e0ebfd6;hp=0485c761330119ac0975073ceb9c6c58e711eecb;hpb=0289162552cd85375605044c696e2a3294e7aa9a;p=tinc diff --git a/src/keys.c b/src/keys.c index 0485c761..2db2b159 100644 --- a/src/keys.c +++ b/src/keys.c @@ -295,7 +295,7 @@ rsa_t *read_rsa_private_key(splay_tree_t *config_tree, char **keyfile) { return key; } -bool read_rsa_public_key(rsa_t **rsa, splay_tree_t *config_tree, const char *name) { +rsa_t *read_rsa_public_key(splay_tree_t *config_tree, const char *name) { FILE *fp; char *fname; char *n; @@ -303,9 +303,9 @@ bool read_rsa_public_key(rsa_t **rsa, splay_tree_t *config_tree, const char *nam /* First, check for simple PublicKey statement */ if(get_config_string(lookup_config(config_tree, "PublicKey"), &n)) { - *rsa = rsa_set_hex_public_key(n, "FFFF"); + rsa_t *rsa = rsa_set_hex_public_key(n, "FFFF"); free(n); - return *rsa != NULL; + return rsa; } /* Else, check for PublicKeyFile statement and read it */ @@ -322,15 +322,15 @@ bool read_rsa_public_key(rsa_t **rsa, splay_tree_t *config_tree, const char *nam return false; } - *rsa = rsa_read_pem_public_key(fp); + rsa_t *rsa = rsa_read_pem_public_key(fp); fclose(fp); - if(!*rsa) { + if(!rsa) { logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA public key file `%s' failed: %s", fname, strerror(errno)); } free(fname); - return *rsa != NULL; + return rsa; } #endif