- Integrated patchs from Juergen Keil <jk@tools.de>

   - Avoid void* pointer arithmatic
   - Use LDFLAGS correctly

diff --git a/ChangeLog b/ChangeLog
index 0bd6c4e7b15d37eb399555f9a58454fd05c505e9..f96ddd45460a596be44ca328676d2a999cb64576 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+19991215
+ - Integrated patchs from Juergen Keil <jk@tools.de>
+   - Avoid void* pointer arithmatic
+   - Use LDFLAGS correctly
+
 19991214
  - OpenBSD CVS Changes
    - [canohost.c]

diff --git a/atomicio.c b/atomicio.c
index 1b960e56f116355b7a212045e1c72154bf8e4add..47f8190ab0781126d6923402e2799937f30bf8e4 100644 (file)
--- a/atomicio.c
+++ b/atomicio.c
@@ -42,7 +42,7 @@ atomicio(f, fd, s, n)
        int res, pos = 0;
 
        while (n > pos) {
-               res = (f) (fd, s + pos, n - pos);
+               res = (f) (fd, (char*)s + pos, n - pos);
                switch (res) {
                case -1:
                        if (errno == EINTR || errno == EAGAIN)

diff --git a/cipher.c b/cipher.c
index 1ca7118525e2f0657dc249c0015addee42fab393..6d2115230ee306bbc433ff10e9df8fd3c00f9b72 100644 (file)
--- a/cipher.c
+++ b/cipher.c
@@ -48,13 +48,13 @@ SSH_3CBC_ENCRYPT(des_key_schedule ks1,
        memcpy(&iv1, iv2, 8);
 
        des_cbc_encrypt(src, dest, len, ks1, &iv1, DES_ENCRYPT);
-       memcpy(&iv1, dest + len - 8, 8);
+       memcpy(&iv1, (char *)dest + len - 8, 8);
 
        des_cbc_encrypt(dest, dest, len, ks2, iv2, DES_DECRYPT);
        memcpy(iv2, &iv1, 8);   /* Note how iv1 == iv2 on entry and exit. */
 
        des_cbc_encrypt(dest, dest, len, ks3, iv3, DES_ENCRYPT);
-       memcpy(iv3, dest + len - 8, 8);
+       memcpy(iv3, (char *)dest + len - 8, 8);
 }
 
 void
@@ -69,10 +69,10 @@ SSH_3CBC_DECRYPT(des_key_schedule ks1,
        memcpy(&iv1, iv2, 8);
 
        des_cbc_encrypt(src, dest, len, ks3, iv3, DES_DECRYPT);
-       memcpy(iv3, src + len - 8, 8);
+       memcpy(iv3, (char *)src + len - 8, 8);
 
        des_cbc_encrypt(dest, dest, len, ks2, iv2, DES_ENCRYPT);
-       memcpy(iv2, dest + len - 8, 8);
+       memcpy(iv2, (char *)dest + len - 8, 8);
 
        des_cbc_encrypt(dest, dest, len, ks1, &iv1, DES_DECRYPT);
        /* memcpy(&iv1, iv2, 8); */

diff --git a/configure.in b/configure.in
index aa23baece1931e8f5dee5a29a0bc5f410481743f..f77e46a09b2514605a14ad2b516b37291fc3a765 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,7 @@ AC_SUBST(ssldir)
 AC_DEFINE_UNQUOTED(ssldir, "$ssldir")
 if test "$ssldir" != "/usr"; then
        CFLAGS="$CFLAGS -I$ssldir/include"
-       LIBS="$LIBS -L$ssldir/lib"
+       LDFLAGS="$LDFLAGS -L$ssldir/lib"
 fi
 LIBS="$LIBS -lssl -lcrypto"
 AC_MSG_RESULT($ssldir)