diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | msg.c | 2 | ||||
-rw-r--r-- | msg.h | 2 | ||||
-rw-r--r-- | ssh-keysign.c | 2 | ||||
-rw-r--r-- | sshconnect2.c | 2 |
5 files changed, 7 insertions, 5 deletions
@@ -75,6 +75,8 @@ | |||
75 | 3) print rate instead of progress bar, no more stars | 75 | 3) print rate instead of progress bar, no more stars |
76 | 4) scale output to tty width | 76 | 4) scale output to tty width |
77 | based on a patch from Niels; ok fries@ lebel@ fgs@ millert@ | 77 | based on a patch from Niels; ok fries@ lebel@ fgs@ millert@ |
78 | - (bal) [msg.c msg.h scp.c ssh-keysign.c sshconnect2.c] Resync CVS IDs since | ||
79 | we already did s/msg_send/ssh_msg_send/ | ||
78 | 80 | ||
79 | 20021205 | 81 | 20021205 |
80 | - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org | 82 | - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org |
@@ -910,4 +912,4 @@ | |||
910 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 912 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
911 | ok provos@ | 913 | ok provos@ |
912 | 914 | ||
913 | $Id: ChangeLog,v 1.2535 2002/12/23 02:53:08 mouring Exp $ | 915 | $Id: ChangeLog,v 1.2536 2002/12/23 02:58:17 mouring Exp $ |
@@ -22,7 +22,7 @@ | |||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
23 | */ | 23 | */ |
24 | #include "includes.h" | 24 | #include "includes.h" |
25 | RCSID("$OpenBSD: msg.c,v 1.4 2002/07/01 16:15:25 deraadt Exp $"); | 25 | RCSID("$OpenBSD: msg.c,v 1.5 2002/12/19 00:07:02 djm Exp $"); |
26 | 26 | ||
27 | #include "buffer.h" | 27 | #include "buffer.h" |
28 | #include "getput.h" | 28 | #include "getput.h" |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: msg.h,v 1.1 2002/05/23 19:24:30 markus Exp $ */ | 1 | /* $OpenBSD: msg.h,v 1.2 2002/12/19 00:07:02 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2002 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
diff --git a/ssh-keysign.c b/ssh-keysign.c index 3288eb182..46028ae51 100644 --- a/ssh-keysign.c +++ b/ssh-keysign.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
23 | */ | 23 | */ |
24 | #include "includes.h" | 24 | #include "includes.h" |
25 | RCSID("$OpenBSD: ssh-keysign.c,v 1.8 2002/11/07 22:08:07 markus Exp $"); | 25 | RCSID("$OpenBSD: ssh-keysign.c,v 1.9 2002/12/19 00:07:02 djm Exp $"); |
26 | 26 | ||
27 | #include <openssl/evp.h> | 27 | #include <openssl/evp.h> |
28 | #include <openssl/rand.h> | 28 | #include <openssl/rand.h> |
diff --git a/sshconnect2.c b/sshconnect2.c index 5859199d7..de33e142b 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.109 2002/12/13 10:03:15 markus Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.110 2002/12/19 00:07:02 djm Exp $"); |
27 | 27 | ||
28 | #include "ssh.h" | 28 | #include "ssh.h" |
29 | #include "ssh2.h" | 29 | #include "ssh2.h" |