diff --git a/example/simple/scp.c b/example/simple/scp.c index f5155b31..12c0c922 100644 --- a/example/simple/scp.c +++ b/example/simple/scp.c @@ -10,12 +10,12 @@ #ifdef HAVE_WINSOCK2_H # include #endif -#ifdef HAVE_NETINET_IN_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H # include #endif +#ifdef HAVE_NETINET_IN_H +# include +#endif # ifdef HAVE_UNISTD_H #include #endif diff --git a/example/simple/scp_nonblock.c b/example/simple/scp_nonblock.c index 2783b120..3480cfd8 100644 --- a/example/simple/scp_nonblock.c +++ b/example/simple/scp_nonblock.c @@ -15,12 +15,12 @@ #ifdef HAVE_WINSOCK2_H # include #endif -#ifdef HAVE_NETINET_IN_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H # include #endif +#ifdef HAVE_NETINET_IN_H +# include +#endif #ifdef HAVE_SYS_SELECT_H # include #endif diff --git a/example/simple/scp_write.c b/example/simple/scp_write.c index 1ad84fe5..eeb03a53 100644 --- a/example/simple/scp_write.c +++ b/example/simple/scp_write.c @@ -10,12 +10,12 @@ #ifdef HAVE_WINSOCK2_H # include #endif -#ifdef HAVE_NETINET_IN_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H # include #endif +#ifdef HAVE_NETINET_IN_H +# include +#endif # ifdef HAVE_UNISTD_H #include #endif diff --git a/example/simple/scp_write_nonblock.c b/example/simple/scp_write_nonblock.c index 34021e83..a3ce7fa7 100644 --- a/example/simple/scp_write_nonblock.c +++ b/example/simple/scp_write_nonblock.c @@ -11,12 +11,12 @@ #ifdef HAVE_WINSOCK2_H # include #endif -#ifdef HAVE_NETINET_IN_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H # include #endif +#ifdef HAVE_NETINET_IN_H +# include +#endif # ifdef HAVE_UNISTD_H #include #endif diff --git a/example/simple/sftp.c b/example/simple/sftp.c index 2f642bca..2c9c2c3c 100644 --- a/example/simple/sftp.c +++ b/example/simple/sftp.c @@ -16,12 +16,12 @@ #ifdef HAVE_WINSOCK2_H # include #endif -#ifdef HAVE_NETINET_IN_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H # include #endif +#ifdef HAVE_NETINET_IN_H +# include +#endif # ifdef HAVE_UNISTD_H #include #endif diff --git a/example/simple/sftp_RW_nonblock.c b/example/simple/sftp_RW_nonblock.c index 3ecb8ac0..70aad82a 100644 --- a/example/simple/sftp_RW_nonblock.c +++ b/example/simple/sftp_RW_nonblock.c @@ -16,12 +16,12 @@ #ifdef HAVE_WINSOCK2_H # include #endif -#ifdef HAVE_NETINET_IN_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H # include #endif +#ifdef HAVE_NETINET_IN_H +# include +#endif #ifdef HAVE_SYS_SELECT_H # include #endif diff --git a/example/simple/sftp_mkdir.c b/example/simple/sftp_mkdir.c index e09baae7..8d61fed7 100644 --- a/example/simple/sftp_mkdir.c +++ b/example/simple/sftp_mkdir.c @@ -16,12 +16,12 @@ #ifdef HAVE_WINSOCK2_H # include #endif -#ifdef HAVE_NETINET_IN_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H # include #endif +#ifdef HAVE_NETINET_IN_H +# include +#endif # ifdef HAVE_UNISTD_H #include #endif diff --git a/example/simple/sftp_mkdir_nonblock.c b/example/simple/sftp_mkdir_nonblock.c index aae80975..346dab26 100644 --- a/example/simple/sftp_mkdir_nonblock.c +++ b/example/simple/sftp_mkdir_nonblock.c @@ -16,12 +16,12 @@ #ifdef HAVE_WINSOCK2_H # include #endif -#ifdef HAVE_NETINET_IN_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H # include #endif +#ifdef HAVE_NETINET_IN_H +# include +#endif # ifdef HAVE_UNISTD_H #include #endif diff --git a/example/simple/sftp_nonblock.c b/example/simple/sftp_nonblock.c index d5cada40..45e15548 100644 --- a/example/simple/sftp_nonblock.c +++ b/example/simple/sftp_nonblock.c @@ -16,12 +16,12 @@ #ifdef HAVE_WINSOCK2_H # include #endif -#ifdef HAVE_NETINET_IN_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H # include #endif +#ifdef HAVE_NETINET_IN_H +# include +#endif #ifdef HAVE_SYS_SELECT_H # include #endif diff --git a/example/simple/sftp_write.c b/example/simple/sftp_write.c index dc231ffb..4d583ab0 100644 --- a/example/simple/sftp_write.c +++ b/example/simple/sftp_write.c @@ -16,12 +16,12 @@ #ifdef HAVE_WINSOCK2_H # include #endif -#ifdef HAVE_NETINET_IN_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H # include #endif +#ifdef HAVE_NETINET_IN_H +# include +#endif # ifdef HAVE_UNISTD_H #include #endif diff --git a/example/simple/sftp_write_nonblock.c b/example/simple/sftp_write_nonblock.c index d1185e74..a40046f0 100644 --- a/example/simple/sftp_write_nonblock.c +++ b/example/simple/sftp_write_nonblock.c @@ -16,12 +16,12 @@ #ifdef HAVE_WINSOCK2_H # include #endif -#ifdef HAVE_NETINET_IN_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H # include #endif +#ifdef HAVE_NETINET_IN_H +# include +#endif # ifdef HAVE_UNISTD_H #include #endif diff --git a/example/simple/sftpdir.c b/example/simple/sftpdir.c index ebdf7316..dd679530 100644 --- a/example/simple/sftpdir.c +++ b/example/simple/sftpdir.c @@ -16,12 +16,12 @@ #ifdef HAVE_WINSOCK2_H # include #endif -#ifdef HAVE_NETINET_IN_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H # include #endif +#ifdef HAVE_NETINET_IN_H +# include +#endif # ifdef HAVE_UNISTD_H #include #endif diff --git a/example/simple/sftpdir_nonblock.c b/example/simple/sftpdir_nonblock.c index 585257e9..4389022c 100644 --- a/example/simple/sftpdir_nonblock.c +++ b/example/simple/sftpdir_nonblock.c @@ -16,12 +16,12 @@ #ifdef HAVE_WINSOCK2_H # include #endif -#ifdef HAVE_NETINET_IN_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H # include #endif +#ifdef HAVE_NETINET_IN_H +# include +#endif # ifdef HAVE_UNISTD_H #include #endif diff --git a/example/simple/ssh2.c b/example/simple/ssh2.c index 98e64e25..90eebfdd 100644 --- a/example/simple/ssh2.c +++ b/example/simple/ssh2.c @@ -19,12 +19,12 @@ #ifdef HAVE_WINSOCK2_H # include #endif -#ifdef HAVE_NETINET_IN_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H # include #endif +#ifdef HAVE_NETINET_IN_H +# include +#endif # ifdef HAVE_UNISTD_H #include #endif diff --git a/example/simple/ssh2_exec.c b/example/simple/ssh2_exec.c index 29b84eb0..db4d445c 100644 --- a/example/simple/ssh2_exec.c +++ b/example/simple/ssh2_exec.c @@ -18,12 +18,12 @@ #ifdef HAVE_WINSOCK2_H # include #endif -#ifdef HAVE_NETINET_IN_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H # include #endif +#ifdef HAVE_NETINET_IN_H +# include +#endif #ifdef HAVE_SYS_SELECT_H # include #endif diff --git a/src/openssl.c b/src/openssl.c index 2fa356f0..b22151bf 100644 --- a/src/openssl.c +++ b/src/openssl.c @@ -247,6 +247,7 @@ _libssh2_rsa_new_private(libssh2_rsa_ctx ** rsa, { pem_read_bio_func read_rsa = (pem_read_bio_func) &PEM_read_bio_RSAPrivateKey; + (void) session; if (!EVP_get_cipherbyname("des")) { /* If this cipher isn't loaded it's a pretty good indication that none are. diff --git a/tests/ssh2.c b/tests/ssh2.c index e03fbfee..c1e510f5 100644 --- a/tests/ssh2.c +++ b/tests/ssh2.c @@ -10,12 +10,12 @@ #ifdef HAVE_WINSOCK2_H # include #endif -#ifdef HAVE_NETINET_IN_H -# include -#endif #ifdef HAVE_SYS_SOCKET_H # include #endif +#ifdef HAVE_NETINET_IN_H +# include +#endif # ifdef HAVE_UNISTD_H #include #endif