summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-05-17 23:02:03 +1000
committerDamien Miller <djm@mindrot.org>2000-05-17 23:02:03 +1000
commitc4be7ce66992811c555375cb303f504153e1b33f (patch)
tree429ab7e2c38e6042e377df9dc4031de433c06879
parent615f939ebb48fdde404aae705057202512731331 (diff)
- RSAless operation patch from kevin_oconnor@standardandpoors.com
-rw-r--r--CREDITS1
-rw-r--r--ChangeLog1
-rw-r--r--sshd.c9
3 files changed, 8 insertions, 3 deletions
diff --git a/CREDITS b/CREDITS
index 7ca3f788d..8ed3d80cc 100644
--- a/CREDITS
+++ b/CREDITS
@@ -33,6 +33,7 @@ Jim Knoble <jmknoble@pobox.com> - Many patches
33jonchen (email unknown) - the original author of PAM support of SSH 33jonchen (email unknown) - the original author of PAM support of SSH
34Juergen Keil <jk@tools.de> - scp bugfixing 34Juergen Keil <jk@tools.de> - scp bugfixing
35Kees Cook <cook@cpoint.net> - scp fixes 35Kees Cook <cook@cpoint.net> - scp fixes
36Kevin O'Connor <kevin_oconnor@standardandpoors.com> - RSAless operation
36Kiyokazu SUTO <suto@ks-and-ks.ne.jp> - Bugfixes 37Kiyokazu SUTO <suto@ks-and-ks.ne.jp> - Bugfixes
37Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> - Bugfixes 38Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> - Bugfixes
38Marc G. Fournier <marc.fournier@acadiau.ca> - Solaris patches 39Marc G. Fournier <marc.fournier@acadiau.ca> - Solaris patches
diff --git a/ChangeLog b/ChangeLog
index 8cefa0fd6..635bc2440 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@
31 - Solaris fixes 31 - Solaris fixes
32 - Checking for ssize_t and memmove. Based on patch from SAKAI Kiyotaka 32 - Checking for ssize_t and memmove. Based on patch from SAKAI Kiyotaka
33 <ksakai@kso.netwk.ntt-at.co.jp> 33 <ksakai@kso.netwk.ntt-at.co.jp>
34 - RSAless operation patch from kevin_oconnor@standardandpoors.com
34 35
3520000513 3620000513
36 - Fix for non-recognised DSA keys from Arkadiusz Miskiewicz 37 - Fix for non-recognised DSA keys from Arkadiusz Miskiewicz
diff --git a/sshd.c b/sshd.c
index a13332cbd..256018f61 100644
--- a/sshd.c
+++ b/sshd.c
@@ -389,9 +389,12 @@ void
389destroy_sensitive_data(void) 389destroy_sensitive_data(void)
390{ 390{
391 /* Destroy the private and public keys. They will no longer be needed. */ 391 /* Destroy the private and public keys. They will no longer be needed. */
392 RSA_free(public_key); 392 if (public_key)
393 RSA_free(sensitive_data.private_key); 393 RSA_free(public_key);
394 RSA_free(sensitive_data.host_key); 394 if (sensitive_data.private_key)
395 RSA_free(sensitive_data.private_key);
396 if (sensitive_data.host_key)
397 RSA_free(sensitive_data.host_key);
395 if (sensitive_data.dsa_host_key != NULL) 398 if (sensitive_data.dsa_host_key != NULL)
396 key_free(sensitive_data.dsa_host_key); 399 key_free(sensitive_data.dsa_host_key);
397} 400}