- Remove references to SSLeay.

 - Big OpenBSD CVS update
  - markus@cvs.openbsd.org
    [clientloop.c]
    - typo
    [session.c]
    - update proctitle on pty alloc/dealloc, e.g. w/ windows client
    [session.c]
    - update proctitle for proto 1, too
    [channels.h nchan.c serverloop.c session.c sshd.c]
    - use c-style comments
  - deraadt@cvs.openbsd.org
    [scp.c]
    - more atomicio
  - markus@cvs.openbsd.org
    [channels.c]
    - set O_NONBLOCK
    [ssh.1]
    - update AUTHOR
    [readconf.c ssh-keygen.c ssh.h]
    - default DSA key file ~/.ssh/id_dsa
    [clientloop.c]
    - typo, rm verbose debug
  - deraadt@cvs.openbsd.org
    [ssh-keygen.1]
    - document DSA use of ssh-keygen
    [sshd.8]
    - a start at describing what i understand of the DSA side
    [ssh-keygen.1]
    - document -X and -x
    [ssh-keygen.c]
    - simplify usage
  - markus@cvs.openbsd.org
    [sshd.8]
    - there is no rhosts_dsa
    [ssh-keygen.1]
    - document -y, update -X,-x
    [nchan.c]
    - fix close for non-open ssh1 channels
    [servconf.c servconf.h ssh.h sshd.8 sshd.c ]
    - s/DsaKey/HostDSAKey/, document option
    [sshconnect2.c]
    - respect number_of_password_prompts
    [channels.c channels.h servconf.c servconf.h session.c sshd.8]
    - GatewayPorts for sshd, ok deraadt@
    [ssh-add.1 ssh-agent.1 ssh.1]
    - more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
    [ssh.1]
    - more info on proto 2
    [sshd.8]
    - sync AUTHOR w/ ssh.1
    [key.c key.h sshconnect.c]
    - print key type when talking about host keys
    [packet.c]
    - clear padding in ssh2
    [dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
    - replace broken uuencode w/ libc b64_ntop
    [auth2.c]
    - log failure before sending the reply
    [key.c radix.c uuencode.c]
    - remote trailing comments before calling __b64_pton
    [auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
    [sshconnect2.c sshd.8]
    - add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
 - Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])

1 files changed, 10 insertions, 10 deletions

diff --git a/scp.c b/scp.c
index 2ac106290..2831f9b99 100644
--- a/scp.c
+++ b/scp.c
@@ -45,7 +45,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: scp.c,v 1.21 2000/05/01 11:10:33 damien Exp $");
+RCSID("$Id: scp.c,v 1.22 2000/05/07 02:03:17 damien Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -573,7 +573,7 @@ next:			(void) close(fd);
                         if (i + amt > stb.st_size)
                                 amt = stb.st_size - i;
                         if (!haderr) {
-                                result = read(fd, bp->buf, amt);
+                                result = atomicio(read, fd, bp->buf, amt);
                                 if (result != amt)
                                         haderr = result >= 0 ? EIO : errno;
                         }
@@ -692,12 +692,12 @@ sink(argc, argv)
                 targisdir = 1;
         for (first = 1;; first = 0) {
                 cp = buf;
-                if (read(remin, cp, 1) <= 0)
+                if (atomicio(read, remin, cp, 1) <= 0)
                         return;
                 if (*cp++ == '\n')
                         SCREWUP("unexpected <newline>");
                 do {
-                        if (read(remin, &ch, sizeof(ch)) != sizeof(ch))
+                        if (atomicio(read, remin, &ch, sizeof(ch)) != sizeof(ch))
                                 SCREWUP("lost connection");
                         *cp++ = ch;
                 } while (cp < &buf[sizeof(buf) - 1] && ch != '\n');
@@ -835,7 +835,7 @@ bad:			run_err("%s: %s", np, strerror(errno));
                                 amt = size - i;
                         count += amt;
                         do {
-                                j = read(remin, cp, amt);
+                                j = atomicio(read, remin, cp, amt);
                                 if (j <= 0) {
                                         run_err("%s", j ? strerror(errno) :
                                                 "dropped connection");
@@ -848,7 +848,7 @@ bad:			run_err("%s: %s", np, strerror(errno));
                         if (count == bp->cnt) {
                                 /* Keep reading so we stay sync'd up. */
                                 if (wrerr == NO) {
-                                        j = write(ofd, bp->buf, count);
+                                        j = atomicio(write, ofd, bp->buf, count);
                                         if (j != count) {
                                                 wrerr = YES;
                                                 wrerrno = j >= 0 ? EIO : errno;
@@ -861,7 +861,7 @@ bad:			run_err("%s: %s", np, strerror(errno));
                 if (showprogress)
                         progressmeter(1);
                 if (count != 0 && wrerr == NO &&
-                    (j = write(ofd, bp->buf, count)) != count) {
+                    (j = atomicio(write, ofd, bp->buf, count)) != count) {
                         wrerr = YES;
                         wrerrno = j >= 0 ? EIO : errno;
                 }
@@ -913,7 +913,7 @@ response()
 {
         char ch, *cp, resp, rbuf[2048];
 
-        if (read(remin, &resp, sizeof(resp)) != sizeof(resp))
+        if (atomicio(read, remin, &resp, sizeof(resp)) != sizeof(resp))
                 lostconn(0);
 
         cp = rbuf;
@@ -926,7 +926,7 @@ response()
         case 1:         /* error, followed by error msg */
         case 2:         /* fatal error, "" */
                 do {
-                        if (read(remin, &ch, sizeof(ch)) != sizeof(ch))
+                        if (atomicio(read, remin, &ch, sizeof(ch)) != sizeof(ch))
                                 lostconn(0);
                         *cp++ = ch;
                 } while (cp < &rbuf[sizeof(rbuf) - 1] && ch != '\n');
@@ -1008,7 +1008,7 @@ run_err(const char *fmt,...)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scp.c,v 1.21 2000/05/01 11:10:33 damien Exp $
+ *      $Id: scp.c,v 1.22 2000/05/07 02:03:17 damien Exp $
  */
 
 char *