diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | README | 6 | ||||
-rw-r--r-- | scp.c | 26 | ||||
-rw-r--r-- | sshconnect.c | 3 | ||||
-rw-r--r-- | sshd.c | 8 |
5 files changed, 41 insertions, 10 deletions
@@ -1,3 +1,11 @@ | |||
1 | 19991118 | ||
2 | - Merged OpenBSD CVS changes | ||
3 | - [scp.c] foregroundproc() in scp | ||
4 | - [sshconnect.h] include fingerprint.h | ||
5 | - [sshd.c] bugfix: the log() for passwd-auth escaped during logging | ||
6 | changes. | ||
7 | - Added openssh.com info to README | ||
8 | |||
1 | 19991117 | 9 | 19991117 |
2 | - Merged OpenBSD CVS changes | 10 | - Merged OpenBSD CVS changes |
3 | - [ChangeLog.Ylonen] noone needs this anymore | 11 | - [ChangeLog.Ylonen] noone needs this anymore |
@@ -5,7 +5,8 @@ all patent-encumbered algorithms removed, all known security bugs | |||
5 | fixed, new features reintroduced and many other clean-ups. More | 5 | fixed, new features reintroduced and many other clean-ups. More |
6 | information about SSH itself can be found in the file README.Ylonen. | 6 | information about SSH itself can be found in the file README.Ylonen. |
7 | OpenSSH has been created by Aaron Cambell, Bob Beck, Markus Friedl, | 7 | OpenSSH has been created by Aaron Cambell, Bob Beck, Markus Friedl, |
8 | Niels Provos, Theo de Raadt, and Dug Song. | 8 | Niels Provos, Theo de Raadt, and Dug Song. It has a homepage at |
9 | http://www.openssh.com/ | ||
9 | 10 | ||
10 | This port consists of the re-introduction of autoconf support, PAM | 11 | This port consists of the re-introduction of autoconf support, PAM |
11 | support (for Linux and Solaris), EGD[1] support, and replacements for | 12 | support (for Linux and Solaris), EGD[1] support, and replacements for |
@@ -47,7 +48,8 @@ Internet Business Solutions | |||
47 | 48 | ||
48 | Credits - | 49 | Credits - |
49 | 50 | ||
50 | The OpenBSD team | 51 | Aaron Cambell, Bob Beck, Markus Friedl, Niels Provos, |
52 | Theo de Raadt, and Dug Song - Creators of OpenSSH | ||
51 | 'jonchen' - the original author of PAM support of SSH | 53 | 'jonchen' - the original author of PAM support of SSH |
52 | Dan Brosemer <odin@linuxfreak.com> - Autoconf and build fixes & Debian scripts | 54 | Dan Brosemer <odin@linuxfreak.com> - Autoconf and build fixes & Debian scripts |
53 | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> - PAM environment patch | 55 | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> - PAM environment patch |
@@ -42,11 +42,11 @@ and ssh has the necessary privileges.) | |||
42 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 42 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
43 | * SUCH DAMAGE. | 43 | * SUCH DAMAGE. |
44 | * | 44 | * |
45 | * $Id: scp.c,v 1.6 1999/11/13 02:22:46 damien Exp $ | 45 | * $Id: scp.c,v 1.7 1999/11/17 22:28:11 damien Exp $ |
46 | */ | 46 | */ |
47 | 47 | ||
48 | #include "includes.h" | 48 | #include "includes.h" |
49 | RCSID("$Id: scp.c,v 1.6 1999/11/13 02:22:46 damien Exp $"); | 49 | RCSID("$Id: scp.c,v 1.7 1999/11/17 22:28:11 damien Exp $"); |
50 | 50 | ||
51 | #include "ssh.h" | 51 | #include "ssh.h" |
52 | #include "xmalloc.h" | 52 | #include "xmalloc.h" |
@@ -976,7 +976,7 @@ run_err(const char *fmt, ...) | |||
976 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 976 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
977 | * SUCH DAMAGE. | 977 | * SUCH DAMAGE. |
978 | * | 978 | * |
979 | * $Id: scp.c,v 1.6 1999/11/13 02:22:46 damien Exp $ | 979 | * $Id: scp.c,v 1.7 1999/11/17 22:28:11 damien Exp $ |
980 | */ | 980 | */ |
981 | 981 | ||
982 | char * | 982 | char * |
@@ -1112,6 +1112,19 @@ updateprogressmeter(void) | |||
1112 | errno = save_errno; | 1112 | errno = save_errno; |
1113 | } | 1113 | } |
1114 | 1114 | ||
1115 | int | ||
1116 | foregroundproc() | ||
1117 | { | ||
1118 | static pid_t pgrp = -1; | ||
1119 | int ctty_pgrp; | ||
1120 | |||
1121 | if (pgrp == -1) | ||
1122 | pgrp = getpgrp(); | ||
1123 | |||
1124 | return((ioctl(STDOUT_FILENO, TIOCGPGRP, &ctty_pgrp) != -1 && | ||
1125 | ctty_pgrp == pgrp)); | ||
1126 | } | ||
1127 | |||
1115 | void | 1128 | void |
1116 | progressmeter(int flag) | 1129 | progressmeter(int flag) |
1117 | { | 1130 | { |
@@ -1129,6 +1142,9 @@ progressmeter(int flag) | |||
1129 | lastupdate = start; | 1142 | lastupdate = start; |
1130 | lastsize = 0; | 1143 | lastsize = 0; |
1131 | } | 1144 | } |
1145 | if (foregroundproc() == 0) | ||
1146 | return; | ||
1147 | |||
1132 | (void)gettimeofday(&now, (struct timezone *)0); | 1148 | (void)gettimeofday(&now, (struct timezone *)0); |
1133 | cursize = statbytes; | 1149 | cursize = statbytes; |
1134 | if (totalbytes != 0) { | 1150 | if (totalbytes != 0) { |
@@ -1145,10 +1161,10 @@ progressmeter(int flag) | |||
1145 | if (barlength > 0) { | 1161 | if (barlength > 0) { |
1146 | i = barlength * ratio / 100; | 1162 | i = barlength * ratio / 100; |
1147 | snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), | 1163 | snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), |
1148 | "|%.*s%*s|", i, | 1164 | "|%.*s%*s|", i, |
1149 | "*****************************************************************************" | 1165 | "*****************************************************************************" |
1150 | "*****************************************************************************", | 1166 | "*****************************************************************************", |
1151 | barlength - i, ""); | 1167 | barlength - i, ""); |
1152 | } | 1168 | } |
1153 | 1169 | ||
1154 | i = 0; | 1170 | i = 0; |
diff --git a/sshconnect.c b/sshconnect.c index be0a6c4b9..74d41e62a 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -15,7 +15,7 @@ login (authentication) dialog. | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | RCSID("$Id: sshconnect.c,v 1.10 1999/11/17 06:29:08 damien Exp $"); | 18 | RCSID("$Id: sshconnect.c,v 1.11 1999/11/17 22:28:11 damien Exp $"); |
19 | 19 | ||
20 | #ifdef HAVE_OPENSSL | 20 | #ifdef HAVE_OPENSSL |
21 | #include <openssl/bn.h> | 21 | #include <openssl/bn.h> |
@@ -36,6 +36,7 @@ RCSID("$Id: sshconnect.c,v 1.10 1999/11/17 06:29:08 damien Exp $"); | |||
36 | #include "uidswap.h" | 36 | #include "uidswap.h" |
37 | #include "compat.h" | 37 | #include "compat.h" |
38 | #include "readconf.h" | 38 | #include "readconf.h" |
39 | #include "fingerprint.h" | ||
39 | 40 | ||
40 | /* Session id for the current session. */ | 41 | /* Session id for the current session. */ |
41 | unsigned char session_id[16]; | 42 | unsigned char session_id[16]; |
@@ -18,7 +18,7 @@ agent connections. | |||
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include "includes.h" | 20 | #include "includes.h" |
21 | RCSID("$Id: sshd.c,v 1.22 1999/11/17 06:29:08 damien Exp $"); | 21 | RCSID("$Id: sshd.c,v 1.23 1999/11/17 22:28:11 damien Exp $"); |
22 | 22 | ||
23 | #include "xmalloc.h" | 23 | #include "xmalloc.h" |
24 | #include "rsa.h" | 24 | #include "rsa.h" |
@@ -1422,11 +1422,12 @@ do_authloop(struct passwd *pw) | |||
1422 | n = BN_new(); | 1422 | n = BN_new(); |
1423 | packet_get_bignum(n, &nlen); | 1423 | packet_get_bignum(n, &nlen); |
1424 | packet_integrity_check(plen, nlen, type); | 1424 | packet_integrity_check(plen, nlen, type); |
1425 | |||
1425 | authenticated = auth_rsa(pw, n); | 1426 | authenticated = auth_rsa(pw, n); |
1426 | BN_clear_free(n); | ||
1427 | log("RSA authentication %s for %.100s.", | 1427 | log("RSA authentication %s for %.100s.", |
1428 | authenticated ? "accepted" : "failed", | 1428 | authenticated ? "accepted" : "failed", |
1429 | pw->pw_name); | 1429 | pw->pw_name); |
1430 | BN_clear_free(n); | ||
1430 | break; | 1431 | break; |
1431 | 1432 | ||
1432 | case SSH_CMSG_AUTH_PASSWORD: | 1433 | case SSH_CMSG_AUTH_PASSWORD: |
@@ -1459,6 +1460,9 @@ do_authloop(struct passwd *pw) | |||
1459 | #else /* HAVE_LIBPAM */ | 1460 | #else /* HAVE_LIBPAM */ |
1460 | /* Try authentication with the password. */ | 1461 | /* Try authentication with the password. */ |
1461 | authenticated = auth_password(pw, password); | 1462 | authenticated = auth_password(pw, password); |
1463 | log("Password authentication %s for %.100s.", | ||
1464 | authenticated ? "accepted" : "failed", | ||
1465 | pw->pw_name); | ||
1462 | 1466 | ||
1463 | memset(password, 0, strlen(password)); | 1467 | memset(password, 0, strlen(password)); |
1464 | xfree(password); | 1468 | xfree(password); |