BIGNUM *e = NULL;
RSA *rsa_key;
FILE *f;
- char *pubname, *privname;
+ char filename[PATH_MAX];
BN_GENCB *cb;
int result;
if(!result) {
fprintf(stderr, "Error during key generation!\n");
+ RSA_free(rsa_key);
return false;
} else
fprintf(stderr, "Done.\n");
- xasprintf(&privname, "%s/rsa_key.priv", confbase);
- f = ask_and_open(privname, "private RSA key");
- free(privname);
+ snprintf(filename, sizeof filename, "%s/rsa_key.priv", confbase);
+ f = ask_and_open(filename, "private RSA key");
- if(!f)
+ if(!f) {
+ RSA_free(rsa_key);
return false;
+ }
#ifdef HAVE_FCHMOD
/* Make it unreadable for others. */
char *name = get_name();
if(name) {
- xasprintf(&pubname, "%s/hosts/%s", confbase, name);
+ snprintf(filename, sizeof filename, "%s/hosts/%s", confbase, name);
free(name);
} else {
- xasprintf(&pubname, "%s/rsa_key.pub", confbase);
+ snprintf(filename, sizeof filename, "%s/rsa_key.pub", confbase);
}
- f = ask_and_open(pubname, "public RSA key");
- free(pubname);
+ f = ask_and_open(filename, "public RSA key");
- if(!f)
+ if(!f) {
+ RSA_free(rsa_key);
return false;
+ }
fputc('\n', f);
PEM_write_RSAPublicKey(f, rsa_key);
fclose(f);
+ RSA_free(rsa_key);
+
return true;
}
"initgroups", strerror(errno));
return false;
}
-#ifndef __ANDROID__
+#ifndef ANDROID
// Not supported in android NDK
endgrent();
endpwent();
ERR_free_strings();
exit_configuration(&config_tree);
- list_free(cmdline_conf);
+ list_delete_list(cmdline_conf);
free_names();
return status;