return ret;
}
+int have_ssh_host_key(const char *hostname, int port,
+ const char *keytype)
+{
+ /*
+ * If we have a host key, verify_host_key will return 0 or 2.
+ * If we don't have one, it'll return 1.
+ */
+ return verify_host_key(hostname, port, keytype, "") != 1;
+}
+
void store_host_key(const char *hostname, int port,
const char *keytype, const char *key)
{
dir = make_filename(INDEX_DIR, NULL);
if (mkdir(dir, 0700) < 0) {
- char *msg = dupprintf("Unable to store host key: mkdir(\"%s\") "
- "returned '%s'", dir, strerror(errno));
- nonfatal(msg);
+ nonfatal("Unable to store host key: mkdir(\"%s\") "
+ "returned '%s'", dir, strerror(errno));
sfree(dir);
sfree(tmpfilename);
return;
wfp = fopen(tmpfilename, "w");
}
if (!wfp) {
- char *msg = dupprintf("Unable to store host key: open(\"%s\") "
- "returned '%s'", tmpfilename, strerror(errno));
- nonfatal(msg);
+ nonfatal("Unable to store host key: open(\"%s\") "
+ "returned '%s'", tmpfilename, strerror(errno));
sfree(tmpfilename);
return;
}
fclose(wfp);
- rename(tmpfilename, filename);
+ if (rename(tmpfilename, filename) < 0) {
+ nonfatal("Unable to store host key: rename(\"%s\",\"%s\")"
+ " returned '%s'", tmpfilename, filename,
+ strerror(errno));
+ }
sfree(tmpfilename);
sfree(filename);
fd = open(fname, O_CREAT | O_WRONLY, 0600);
if (fd < 0) {
if (errno != ENOENT) {
- char *msg = dupprintf("Unable to write random seed: open(\"%s\") "
- "returned '%s'", fname, strerror(errno));
- nonfatal(msg);
- sfree(msg);
+ nonfatal("Unable to write random seed: open(\"%s\") "
+ "returned '%s'", fname, strerror(errno));
sfree(fname);
return;
}
dir = make_filename(INDEX_DIR, NULL);
if (mkdir(dir, 0700) < 0) {
- char *msg = dupprintf("Unable to write random seed: mkdir(\"%s\") "
- "returned '%s'", dir, strerror(errno));
- nonfatal(msg);
- sfree(msg);
+ nonfatal("Unable to write random seed: mkdir(\"%s\") "
+ "returned '%s'", dir, strerror(errno));
sfree(fname);
sfree(dir);
return;
sfree(dir);
fd = open(fname, O_CREAT | O_WRONLY, 0600);
- if (errno != ENOENT) {
- char *msg = dupprintf("Unable to write random seed: open(\"%s\") "
- "returned '%s'", fname, strerror(errno));
- nonfatal(msg);
- sfree(msg);
+ if (fd < 0) {
+ nonfatal("Unable to write random seed: open(\"%s\") "
+ "returned '%s'", fname, strerror(errno));
sfree(fname);
return;
}
while (len > 0) {
int ret = write(fd, data, len);
if (ret < 0) {
- char *msg = dupprintf("Unable to write random seed: write "
- "returned '%s'", strerror(errno));
- nonfatal(msg);
- sfree(msg);
+ nonfatal("Unable to write random seed: write "
+ "returned '%s'", strerror(errno));
break;
}
len -= ret;