summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-12-07 16:45:20 +1100
committerDamien Miller <djm@mindrot.org>1999-12-07 16:45:20 +1100
commit23aa96edca3f8db12a7548108c2b05bf1f28a14a (patch)
treebcb15d216bf1836b822b73a571f01216add5615c
parent534115826b5d347610605f6559359d74542195e1 (diff)
Reimport with -kb set
-rw-r--r--atomicio.c57
-rw-r--r--fingerprint.c1
2 files changed, 57 insertions, 1 deletions
diff --git a/atomicio.c b/atomicio.c
new file mode 100644
index 000000000..85e67d9a0
--- /dev/null
+++ b/atomicio.c
@@ -0,0 +1,57 @@
1/*
2 * Copyright (c) 1999 Theo de Raadt
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 *
14 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
15 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
16 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
17 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include "includes.h"
27RCSID("$Id: atomicio.c,v 1.3 1999/12/07 05:45:20 damien Exp $");
28
29#include "xmalloc.h"
30#include "ssh.h"
31
32/*
33 * ensure all of data on socket comes through. f==read || f==write
34 */
35int
36atomicio(f, fd, s, n)
37 int (*f) ();
38 int fd;
39 void *s;
40 size_t n;
41{
42 int res, pos = 0;
43
44 while (n > pos) {
45 res = (f) (fd, s + pos, n - pos);
46 switch (res) {
47 case -1:
48 if (errno == EINTR || errno == EAGAIN)
49 continue;
50 case 0:
51 return (res);
52 default:
53 pos += res;
54 }
55 }
56 return (pos);
57}
diff --git a/fingerprint.c b/fingerprint.c
index f032a5144..7784e8b7d 100644
--- a/fingerprint.c
+++ b/fingerprint.c
@@ -32,7 +32,6 @@ RCSID("$Id: fingerprint.c,v 1.4 1999/11/24 16:15:25 markus Exp $");
32 32
33#include "ssh.h" 33#include "ssh.h"
34#include "xmalloc.h" 34#include "xmalloc.h"
35
36#ifdef HAVE_OPENSSL 35#ifdef HAVE_OPENSSL
37#include <openssl/md5.h> 36#include <openssl/md5.h>
38#endif 37#endif