tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

- Avoid void* pointer arithmatic
   - Use LDFLAGS correctly
This commit is contained in:
Damien Miller 1999-12-15 09:06:28 +11:00
parent 6ae00d6c96
commit 84093e9d74
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
19991215
- Integrated patchs from Juergen Keil <jk@tools.de>
- Avoid void* pointer arithmatic
- Use LDFLAGS correctly
19991214 19991214
- OpenBSD CVS Changes - OpenBSD CVS Changes
- [canohost.c] - [canohost.c]

4
atomicio.c
View File

@ -24,7 +24,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: atomicio.c,v 1.7 1999/12/07 06:03:33 damien Exp $"); RCSID("$Id: atomicio.c,v 1.8 1999/12/14 22:06:28 damien Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh.h" #include "ssh.h"
@ -42,7 +42,7 @@ atomicio(f, fd, s, n)
int res, pos = 0; int res, pos = 0;
while (n > pos) { while (n > pos) {
res = (f) (fd, s + pos, n - pos); res = (f) (fd, (char*)s + pos, n - pos);
switch (res) { switch (res) {
case -1: case -1:
if (errno == EINTR || errno == EAGAIN) if (errno == EINTR || errno == EAGAIN)

10
cipher.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: cipher.c,v 1.9 1999/12/12 21:27:33 damien Exp $"); RCSID("$Id: cipher.c,v 1.10 1999/12/14 22:06:28 damien Exp $");
#include "ssh.h" #include "ssh.h"
#include "cipher.h" #include "cipher.h"
@ -48,13 +48,13 @@ SSH_3CBC_ENCRYPT(des_key_schedule ks1,
memcpy(&iv1, iv2, 8); memcpy(&iv1, iv2, 8);
des_cbc_encrypt(src, dest, len, ks1, &iv1, DES_ENCRYPT); 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); des_cbc_encrypt(dest, dest, len, ks2, iv2, DES_DECRYPT);
memcpy(iv2, &iv1, 8); /* Note how iv1 == iv2 on entry and exit. */ memcpy(iv2, &iv1, 8); /* Note how iv1 == iv2 on entry and exit. */
des_cbc_encrypt(dest, dest, len, ks3, iv3, DES_ENCRYPT); des_cbc_encrypt(dest, dest, len, ks3, iv3, DES_ENCRYPT);
memcpy(iv3, dest + len - 8, 8); memcpy(iv3, (char *)dest + len - 8, 8);
} }
void void
@ -69,10 +69,10 @@ SSH_3CBC_DECRYPT(des_key_schedule ks1,
memcpy(&iv1, iv2, 8); memcpy(&iv1, iv2, 8);
des_cbc_encrypt(src, dest, len, ks3, iv3, DES_DECRYPT); 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); 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); des_cbc_encrypt(dest, dest, len, ks1, &iv1, DES_DECRYPT);
/* memcpy(&iv1, iv2, 8); */ /* memcpy(&iv1, iv2, 8); */

2
configure.in
View File

@ -31,7 +31,7 @@ AC_SUBST(ssldir)
AC_DEFINE_UNQUOTED(ssldir, "$ssldir") AC_DEFINE_UNQUOTED(ssldir, "$ssldir")
if test "$ssldir" != "/usr"; then if test "$ssldir" != "/usr"; then
CFLAGS="$CFLAGS -I$ssldir/include" CFLAGS="$CFLAGS -I$ssldir/include"
LIBS="$LIBS -L$ssldir/lib" LDFLAGS="$LDFLAGS -L$ssldir/lib"
fi fi
LIBS="$LIBS -lssl -lcrypto" LIBS="$LIBS -lssl -lcrypto"
AC_MSG_RESULT($ssldir) AC_MSG_RESULT($ssldir)