mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-30 18:03:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

upstream: sshsig: return correct error, fix null-deref; ok djm

Browse Source 
OpenBSD-Commit-ID: 1d1af7cd538b8b23e621cf7ab84f11e7a923edcd
This commit is contained in:
markus@openbsd.org 2020-03-06 18:13:29 +00:00 committed by Damien Miller
parent 6fb6f186cb
commit 15be29e1e3
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sshsig.c
View File

@ -209,8 +209,10 @@ sshsig_wrap_sign(struct sshkey *key, const char *hashalg,
goto done;
}
*out = blob;
blob = NULL;
if (out != NULL) {
*out = blob;
blob = NULL;
}
r = 0;
done:
free(sig);
@ -424,7 +426,7 @@ hash_buffer(const struct sshbuf *m, const char *hashalg, struct sshbuf **bp)
out:
sshbuf_free(b);
explicit_bzero(hash, sizeof(hash));
return 0;
return r;
}
int
@ -552,7 +554,7 @@ hash_file(int fd, const char *hashalg, struct sshbuf **bp)
sshbuf_free(b);
ssh_digest_free(ctx);
explicit_bzero(hash, sizeof(hash));
return 0;
return r;
}
int
@ -835,7 +837,7 @@ sshsig_check_allowed_keys(const char *path, const struct sshkey *sign_key,
char *line = NULL;
size_t linesize = 0;
u_long linenum = 0;
int r, oerrno;
int r = SSH_ERR_INTERNAL_ERROR, oerrno;
/* Check key and principal against file */
if ((f = fopen(path, "r")) == NULL) {