updated info for 1.2.4

Building libssh2-1.2.3 on Tru64 fails at line 48 and 166 because socklen_t
isn't defined on Tru64 unless _POSIX_PII_SOCKET is defined.

This patch updates configure.ac to add -D_POSIX_PII_SOCKET when building
on Tru64 platform(s).

NEWS

@@ -1,3 +1,9 @@
+Version 1.2.4 (February 13, 2010)
+
+ o Resolve compile issues on Solaris x64 and UltraSPARC
+ o Allow compiling with OpenSSL when AES isn't available
+ o Fix Tru64 socklen_t compile issue with example/direct_tcpip.c
+
 Version 1.2.3 (February 3, 2010)
 
  o Added libssh2_trace_sethandler()

RELEASE-NOTES

@@ -1,27 +1,18 @@
-libssh2 1.2.3
+libssh2 1.2.4
 
 This release includes the following changes:
 
- o ssh-agent support with the new libssh2_agent_* functions
+ o 
- o Added libssh2_trace_sethandler()
- o Added the direct_tcpip.c and ssh2_agent.c examples
 
 This release includes the following bugfixes:
 
- o Fixed memory leak in userauth_publickey
+ o Resolve compile issues on Solaris x64 and UltraSPARC
- o Fixed publickey authentication regression
+ o Allow compiling with OpenSSL when AES isn't available
- o Silenced several compiler warnings
+ o Fix Tru64 socklen_t compile issue with example/direct_tcpip.c
- o avoid returning data to memory already freed
- o transport layer fix for bogus -39 (LIBSSH2_ERROR_BAD_USE) errors
- o Fixed padding in ssh-dss signature blob encoding
- o Fixed direction blocking flag problems
- o Fixed memory leak in sftp_fstat()
 
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- Simon Josefsson, Peter Stuge, Daiki Ueno, Dave McCaldon,
+ Dan Fandrich, Dave McCaldon, Peter Stuge
- Alexander Lamaison
- 
  
         Thanks! (and sorry if I forgot to mention someone)

configure.ac

@@ -41,6 +41,9 @@ case "$host" in
 	;;
     *hpux*)
     ;;
+    *osf*)
+    CFLAGS="$CFLAGS -D_POSIX_PII_SOCKET"
+    ;;
     *)
     ;;
 esac

example/direct_tcpip.c

@@ -18,6 +18,10 @@
 #include <unistd.h>
 #include <sys/types.h>
 
+#ifndef INADDR_NONE
+#define INADDR_NONE (in_addr_t)-1
+#endif
+
 const char *keyfile1 = "/home/username/.ssh/id_rsa.pub";
 const char *keyfile2 = "/home/username/.ssh/id_rsa";
 const char *username = "username";

include/libssh2.h

@@ -88,13 +88,13 @@ typedef long long libssh2_int64_t;
    to make the BANNER define (used by src/session.c) be a valid SSH
    banner. Release versions have no appended strings and may of course not
    have dashes either. */
-#define LIBSSH2_VERSION                             "1.2.2_DEV"
+#define LIBSSH2_VERSION                             "1.2.4_DEV"
 
 /* The numeric version number is also available "in parts" by using these
    defines: */
 #define LIBSSH2_VERSION_MAJOR                       1
 #define LIBSSH2_VERSION_MINOR                       2
-#define LIBSSH2_VERSION_PATCH                       2
+#define LIBSSH2_VERSION_PATCH                       4
 
 /* This is the numeric version of the libssh2 version number, meant for easier
    parsing and comparions by programs. The LIBSSH2_VERSION_NUM define will
@@ -111,7 +111,7 @@ typedef long long libssh2_int64_t;
    and it is always a greater number in a more recent release. It makes
    comparisons with greater than and less than work.
 */
-#define LIBSSH2_VERSION_NUM                         0x010202
+#define LIBSSH2_VERSION_NUM                         0x010204
 
 /*
  * This is the date and time when the full source package was created. The

src/agent.c

@@ -142,7 +142,7 @@ static int
 agent_connect_unix(LIBSSH2_AGENT *agent)
 {
     const char *path;
-    struct sockaddr_un sun;
+    struct sockaddr_un s_un;
 
     path = getenv("SSH_AUTH_SOCK");
     if (!path) {
@@ -154,9 +154,9 @@ agent_connect_unix(LIBSSH2_AGENT *agent)
         return -1;
     }
 
-    sun.sun_family = AF_UNIX;
+    s_un.sun_family = AF_UNIX;
-    strncpy (sun.sun_path, path, sizeof sun.sun_path);
+    strncpy (s_un.sun_path, path, sizeof s_un.sun_path);
-    if (connect(agent->fd, (struct sockaddr*)(&sun), sizeof sun) != 0) {
+    if (connect(agent->fd, (struct sockaddr*)(&s_un), sizeof s_un) != 0) {
         close (agent->fd);
         return -1;
     }

src/openssl.c

@@ -199,6 +199,7 @@ _libssh2_cipher_crypt(_libssh2_cipher_ctx * ctx,
     return ret == 1 ? 0 : 1;
 }
 
+#if LIBSSH2_AES_CTR
 #include <openssl/aes.h>
 
 typedef struct
@@ -300,6 +301,7 @@ _libssh2_EVP_aes_256_ctr(void)
 {
     return make_ctr_evp (32);
 }
+#endif /* LIBSSH2_AES_CTR */
 
 /* TODO: Optionally call a passphrase callback specified by the
  * calling program