RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-03 00:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
Convert some explicit_bzero()/free() calls to freezero().

ok deraadt@ dtucker@

OpenBSD-Commit-ID: f566ab99149650ebe58b1d4b946ea726c3829609
This commit is contained in:
jsing@openbsd.org 2018-02-07 05:17:56 +00:00 committed by Darren Tucker
parent 94ec2b69d4
commit 1749991c55
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ssh-rsa.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-rsa.c,v 1.64 2017/12/18 23:14:34 djm Exp $ */ /* $OpenBSD: ssh-rsa.c,v 1.65 2018/02/07 05:17:56 jsing Exp $ */
/* /*
* Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org> * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org>
* *
@ -120,7 +120,7 @@ ssh_rsa_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
const u_char *data, size_t datalen, const char *alg_ident) const u_char *data, size_t datalen, const char *alg_ident)
{ {
u_char digest[SSH_DIGEST_MAX_LENGTH], *sig = NULL; u_char digest[SSH_DIGEST_MAX_LENGTH], *sig = NULL;
size_t slen; size_t slen = 0;
u_int dlen, len; u_int dlen, len;
int nid, hash_alg, ret = SSH_ERR_INTERNAL_ERROR; int nid, hash_alg, ret = SSH_ERR_INTERNAL_ERROR;
struct sshbuf *b = NULL; struct sshbuf *b = NULL;
@ -189,10 +189,7 @@ ssh_rsa_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
ret = 0; ret = 0;
out: out:
explicit_bzero(digest, sizeof(digest)); explicit_bzero(digest, sizeof(digest));
if (sig != NULL) { freezero(sig, slen);
explicit_bzero(sig, slen);
free(sig);
}
sshbuf_free(b); sshbuf_free(b);
return ret; return ret;
} }
@ -204,7 +201,7 @@ ssh_rsa_verify(const struct sshkey *key,
{ {
char *sigtype = NULL; char *sigtype = NULL;
int hash_alg, ret = SSH_ERR_INTERNAL_ERROR; int hash_alg, ret = SSH_ERR_INTERNAL_ERROR;
size_t len, diff, modlen, dlen; size_t len = 0, diff, modlen, dlen;
struct sshbuf *b = NULL; struct sshbuf *b = NULL;
u_char digest[SSH_DIGEST_MAX_LENGTH], *osigblob, *sigblob = NULL; u_char digest[SSH_DIGEST_MAX_LENGTH], *osigblob, *sigblob = NULL;
@ -269,10 +266,7 @@ ssh_rsa_verify(const struct sshkey *key,
ret = openssh_RSA_verify(hash_alg, digest, dlen, sigblob, len, ret = openssh_RSA_verify(hash_alg, digest, dlen, sigblob, len,
key->rsa); key->rsa);
out: out:
if (sigblob != NULL) { freezero(sigblob, len);
explicit_bzero(sigblob, len);
free(sigblob);
}
free(sigtype); free(sigtype);
sshbuf_free(b); sshbuf_free(b);
explicit_bzero(digest, sizeof(digest)); explicit_bzero(digest, sizeof(digest));
@ -394,10 +388,7 @@ openssh_RSA_verify(int hash_alg, u_char *hash, size_t hashlen,
} }
ret = 0; ret = 0;
done: done:
if (decrypted) { freezero(decrypted, rsasize);
explicit_bzero(decrypted, rsasize);
free(decrypted);
}
return ret; return ret;
} }
#endif /* WITH_OPENSSL */ #endif /* WITH_OPENSSL */