return false;
}
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
// We cannot atomically replace files on Windows.
char bakfile[PATH_MAX] = "";
snprintf(bakfile, sizeof(bakfile), "%s.bak", filename);
return false;
}
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
unlink(bakfile);
#endif
fprintf(stderr, "Warning: old key(s) found and disabled.\n");
return NULL;
}
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
struct stat s;
if(fstat(fileno(fp), &s)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Could not stat Ed25519 private key file `%s': %s'", fname, strerror(errno));
free(fname);
+ fclose(fp);
return false;
}
return key;
}
-bool read_ecdsa_public_key(ecdsa_t **ecdsa, splay_tree_t **config_tree, const char *name) {
- if(ecdsa_active(*ecdsa)) {
- return true;
- }
-
+ecdsa_t *read_ecdsa_public_key(splay_tree_t **config_tree, const char *name) {
FILE *fp;
char *fname;
char *p;
if(!*config_tree) {
- init_configuration(config_tree);
+ *config_tree = create_configuration();
if(!read_host_config(*config_tree, name, true)) {
- return false;
+ return NULL;
}
}
/* First, check for simple Ed25519PublicKey statement */
if(get_config_string(lookup_config(*config_tree, "Ed25519PublicKey"), &p)) {
- *ecdsa = ecdsa_set_base64_public_key(p);
+ ecdsa_t *ecdsa = ecdsa_set_base64_public_key(p);
free(p);
- return *ecdsa != NULL;
+ return ecdsa;
}
/* Else, check for Ed25519PublicKeyFile statement and read it */
logger(DEBUG_ALWAYS, LOG_ERR, "Error reading Ed25519 public key file `%s': %s",
fname, strerror(errno));
free(fname);
- return false;
+ return NULL;
}
- *ecdsa = ecdsa_read_pem_public_key(fp);
+ ecdsa_t *ecdsa = ecdsa_read_pem_public_key(fp);
- if(!*ecdsa && errno != ENOENT) {
+ if(!ecdsa && errno != ENOENT) {
logger(DEBUG_ALWAYS, LOG_ERR, "Parsing Ed25519 public key file `%s' failed.", fname);
}
fclose(fp);
free(fname);
- return *ecdsa != NULL;
+ return ecdsa;
}
#ifndef DISABLE_LEGACY
if(get_config_string(rsa_priv_conf, &d)) {
if(!get_config_string(lookup_config(config_tree, "PublicKey"), &n)) {
logger(DEBUG_ALWAYS, LOG_ERR, "PrivateKey used but no PublicKey found!");
- free(d);
+ free_string(d);
return NULL;
}
key = rsa_set_hex_private_key(n, "FFFF", d);
free(n);
- free(d);
+ free_string(d);
if(key && keyfile && rsa_priv_conf->file) {
*keyfile = xstrdup(rsa_priv_conf->file);
return NULL;
}
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
struct stat s;
if(fstat(fileno(fp), &s)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Could not stat RSA private key file `%s': %s'", fname, strerror(errno));
free(fname);
+ fclose(fp);
return NULL;
}
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;
/* 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 */
if(!fp) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error reading RSA public key file `%s': %s", fname, strerror(errno));
free(fname);
- return false;
+ return NULL;
}
- *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