diff options
author | Damien Miller <djm@mindrot.org> | 2000-05-13 12:31:22 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-05-13 12:31:22 +1000 |
commit | 95fe91bd84d7613ce37cb8b38212c4301610639f (patch) | |
tree | 086034ee41c00ec2dd3df27c9c985b21a4feab5b | |
parent | accfeb3afe07be4875e33dc8f269c868ea929274 (diff) |
- Fix for non-recognised DSA keys from Arkadiusz Miskiewicz
<misiek@pld.org.pl>
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | sshconnect.c | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,6 +1,11 @@ +20000513 + - Fix for non-recognised DSA keys from Arkadiusz Miskiewicz + <misiek@pld.org.pl> + 20000511 - Fix for prng_seed permissions checking from Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> + - "make host-key" fix for Irix 20000509 - OpenBSD CVS update diff --git a/Makefile.in b/Makefile.in index 39f2f995..7c96adc7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -140,8 +140,8 @@ install: manpages $(TARGETS) fi host-key: ssh-keygen - ./ssh-keygen -b 1024 -f $(sysconfdir)/ssh_host_key -N '' - ./ssh-keygen -d -f $(sysconfdir)/ssh_host_dsa_key -N '' + ./ssh-keygen -b 1024 -f $(sysconfdir)/ssh_host_key -N "" + ./ssh-keygen -d -f $(sysconfdir)/ssh_host_dsa_key -N "" uninstallall: uninstall -rm -f $(DESTDIR)$(sysconfdir)/ssh_config diff --git a/sshconnect.c b/sshconnect.c index 9b25d7c2..d74658c9 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -255,7 +255,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, temporarily_use_uid(original_real_uid); if (connect(sock, ai->ai_addr, ai->ai_addrlen) >= 0) { /* Successful connection. */ - memcpy(hostaddr, ai->ai_addr, sizeof(*(ai->ai_addr))); + memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen); restore_uid(); break; } else { |