generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Swap ordering of packet_add/packet-inspection to avoid inspect after free. Fix OpenSSL detection using pkg-config.

Browse Source
This commit is contained in:
Sara Golemon 2006-05-26 22:36:48 +00:00
parent 09b93e4bb6
commit 5f85317efa
3 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -8,6 +8,10 @@ Version 0.14
Allow socket_fd == 0 in libssh2_session_startup(). (puudeli) Allow socket_fd == 0 in libssh2_session_startup(). (puudeli)
Swap ordering of packet_add/packet-inspection to avoid inspect after free. (Selcuk)
Fix OpenSSL detection using pkg-config. (Dan Casey)
Version 0.13 Version 0.13
------------ ------------

38
configure.in
View File

@ -64,15 +64,18 @@ if test "$LIBSSH2_OPENSSL_DIR" = "no" || test "$LIBSSH2_OPENSSL_DIR" = "yes"; th
fi fi
found_openssl=no found_openssl=no
pkgcfg_openssl=no
unset OPENSSL_INCDIR unset OPENSSL_INCDIR
unset OPENSSL_LIBDIR unset OPENSSL_INCLINE
unset OPENSSL_LIBLINE
AC_MSG_CHECKING([for OpenSSL]) AC_MSG_CHECKING([for OpenSSL])
# Explicit path given, use it rather than pkg-config # Explicit path given, use it rather than pkg-config
if test ! -z "$LIBSSH2_OPENSSL_DIR"; then if test ! -z "$LIBSSH2_OPENSSL_DIR"; then
found_openssl=yes found_openssl=yes
OPENSSL_LIBDIR=$LIBSSH2_OPENSSL_DIR/lib OPENSSL_LIBLINE="-L$LIBSSH2_OPENSSL_DIR/lib -lcrypto"
OPENSSL_INCLINE="-I$LIBSSH2_OPENSSL_DIR/include"
OPENSSL_INCDIR=$LIBSSH2_OPENSSL_DIR/include OPENSSL_INCDIR=$LIBSSH2_OPENSSL_DIR/include
AC_MSG_RESULT([Using explicit path $LIBSSH2_OPENSSL_DIR]) AC_MSG_RESULT([Using explicit path $LIBSSH2_OPENSSL_DIR])
fi fi
@ -80,8 +83,9 @@ fi
# If pkg-config is found try using it # If pkg-config is found try using it
if test "$found_openssl" = "no" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then if test "$found_openssl" = "no" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
found_openssl=yes found_openssl=yes
OPENSSL_LIBDIR=`$PKG_CONFIG --libs openssl` pkgcfg_openssl=yes
OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` OPENSSL_LIBLINE=`$PKG_CONFIG --libs openssl`
OPENSSL_INCLINE=`$PKG_CONFIG --variable=includedir openssl`
AC_MSG_RESULT([Using paths from pkg-config]) AC_MSG_RESULT([Using paths from pkg-config])
fi fi
@ -91,39 +95,43 @@ if test "$found_openssl" = "no"; then
for i in $OPENSSL_SEARCH_PATH; do for i in $OPENSSL_SEARCH_PATH; do
if test -r $i/include/openssl/evp.h; then if test -r $i/include/openssl/evp.h; then
OPENSSL_INCLINE="-I$i/include"
OPENSSL_INCDIR=$i/include OPENSSL_INCDIR=$i/include
fi fi
if test -r $i/include/openssl/hmac.h; then if test -r $i/include/openssl/hmac.h; then
OPENSSL_INCLINE="-I$i/include"
OPENSSL_INCDIR=$i/include OPENSSL_INCDIR=$i/include
fi fi
if test -r $i/lib/libcrypto.a -o -r $i/lib/libcrypto.$SHLIB_SUFFIX_NAME; then if test -r $i/lib/libcrypto.a -o -r $i/lib/libcrypto.$SHLIB_SUFFIX_NAME; then
OPENSSL_LIBDIR=$i/lib OPENSSL_LIBLINE="-L$i/lib -lcrypto"
fi fi
test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break test -n "$OPENSSL_INCLINE" && test -n "$OPENSSL_LIBLINE" && break
done done
if test -z "$OPENSSL_INCDIR"; then if test -z "$OPENSSL_INCLINE"; then
AC_MSG_ERROR([Cannot find OpenSSL's <evp.h> or <hmac.h>]) AC_MSG_ERROR([Cannot find OpenSSL's <evp.h> or <hmac.h>])
fi fi
if test -z "$OPENSSL_LIBDIR"; then if test -z "$OPENSSL_LIBLINE"; then
AC_MSG_ERROR([Cannot find OpenSSL's libcrypto]) AC_MSG_ERROR([Cannot find OpenSSL's libcrypto])
fi fi
AC_MSG_RESULT([$OPENSSL_INCDIR $OPENSSL_LIBDIR]) AC_MSG_RESULT([$OPENSSL_INCLINE $OPENSSL_LIBLINE])
fi fi
# #
# Confirm required OpenSSL libs # Confirm required OpenSSL libs
# #
if test ! -r $OPENSSL_INCDIR/openssl/bn.h || test ! -r $OPENSSL_INCDIR/openssl/evp.h || \ if test ! "$pkgcfg_openssl" = "yes"; then
test ! -r $OPENSSL_INCDIR/openssl/hmac.h || test ! -r $OPENSSL_INCDIR/openssl/pem.h || \ if test ! -r $OPENSSL_INCDIR/openssl/bn.h || test ! -r $OPENSSL_INCDIR/openssl/evp.h || \
test ! -r $OPENSSL_INCDIR/openssl/sha.h; then test ! -r $OPENSSL_INCDIR/openssl/hmac.h || test ! -r $OPENSSL_INCDIR/openssl/pem.h || \
AC_MSG_ERROR([Missing one or more of <openssl/bn.h>, <openssl/evp.h>, <openssl/hmac.h>, <openssl/pem.h>, <openssl/sha.h>]) test ! -r $OPENSSL_INCDIR/openssl/sha.h; then
AC_MSG_ERROR([Missing one or more of <openssl/bn.h>, <openssl/evp.h>, <openssl/hmac.h>, <openssl/pem.h>, <openssl/sha.h>])
fi
fi fi
CFLAGS="$CFLAGS -I$OPENSSL_INCDIR" CFLAGS="$CFLAGS $OPENSSL_INCLINE"
LDFLAGS="$LDFLAGS -L$OPENSSL_LIBDIR -lcrypto" LDFLAGS="$LDFLAGS $OPENSSL_LIBLINE"
# #
# zlib # zlib

6
src/packet.c
View File

@ -862,9 +862,9 @@ int libssh2_packet_read(LIBSSH2_SESSION *session, int should_block)
} }
} }
packet_type = payload[0];
libssh2_packet_add(session, payload, payload_len, macstate); libssh2_packet_add(session, payload, payload_len, macstate);
packet_type = payload[0];
} else { /* No cipher active */ } else { /* No cipher active */
unsigned char *payload; unsigned char *payload;
unsigned char buf[24]; unsigned char buf[24];
@ -911,11 +911,11 @@ int libssh2_packet_read(LIBSSH2_SESSION *session, int should_block)
break; break;
} }
packet_type = payload[0];
/* MACs don't exist in non-encrypted mode */ /* MACs don't exist in non-encrypted mode */
libssh2_packet_add(session, payload, payload_len, LIBSSH2_MAC_CONFIRMED); libssh2_packet_add(session, payload, payload_len, LIBSSH2_MAC_CONFIRMED);
session->remote.seqno++; session->remote.seqno++;
packet_type = payload[0];
} }
return packet_type; return packet_type;
} }