diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | Makefile.in | 12 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | sshbuf-getput-basic.c | 2 | ||||
-rw-r--r-- | sshbuf-getput-crypto.c | 2 | ||||
-rw-r--r-- | sshbuf.c | 2 |
6 files changed, 18 insertions, 7 deletions
@@ -89,6 +89,8 @@ | |||
89 | OK from djm@ and dtucker@ | 89 | OK from djm@ and dtucker@ |
90 | - (djm) [configure.ac] Unconditionally define WITH_OPENSSL until we write | 90 | - (djm) [configure.ac] Unconditionally define WITH_OPENSSL until we write |
91 | portability glue to support building without libcrypto | 91 | portability glue to support building without libcrypto |
92 | - (djm) [Makefile.in configure.ac sshbuf-getput-basic.c] | ||
93 | [sshbuf-getput-crypto.c sshbuf.c] compilation and portability fixes | ||
92 | 94 | ||
93 | 20140430 | 95 | 20140430 |
94 | - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already | 96 | - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already |
diff --git a/Makefile.in b/Makefile.in index 28a8ec41b..53f0f1f72 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.356 2014/02/04 00:12:56 djm Exp $ | 1 | # $Id: Makefile.in,v 1.357 2014/05/15 04:58:08 djm Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -63,7 +63,15 @@ MANFMT=@MANFMT@ | |||
63 | 63 | ||
64 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) | 64 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) |
65 | 65 | ||
66 | LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \ | 66 | LIBOPENSSH_OBJS=\ |
67 | ssherr.o \ | ||
68 | sshbuf.o \ | ||
69 | sshbuf-getput-basic.o \ | ||
70 | sshbuf-misc.o \ | ||
71 | sshbuf-getput-crypto.o | ||
72 | |||
73 | LIBSSH_OBJS=${LIBOPENSSH_OBJS} \ | ||
74 | authfd.o authfile.o bufaux.o bufbn.o buffer.o \ | ||
67 | canohost.o channels.o cipher.o cipher-aes.o \ | 75 | canohost.o channels.o cipher.o cipher-aes.o \ |
68 | cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ | 76 | cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ |
69 | compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ | 77 | compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ |
diff --git a/configure.ac b/configure.ac index 2a30eec60..058cfd090 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.572 2014/05/15 04:43:38 djm Exp $ | 1 | # $Id: configure.ac,v 1.573 2014/05/15 04:58:08 djm Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) | 17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) |
18 | AC_REVISION($Revision: 1.572 $) | 18 | AC_REVISION($Revision: 1.573 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -2359,6 +2359,7 @@ AC_RUN_IFELSE( | |||
2359 | 2359 | ||
2360 | # XXX make --without-openssl work | 2360 | # XXX make --without-openssl work |
2361 | AC_DEFINE_UNQUOTED([WITH_OPENSSL], [1], [use libcrypto for cryptography]) | 2361 | AC_DEFINE_UNQUOTED([WITH_OPENSSL], [1], [use libcrypto for cryptography]) |
2362 | AC_DEFINE_UNQUOTED([WITH_SSH1], [1], [include SSH protocol version 1 support]) | ||
2362 | 2363 | ||
2363 | AC_ARG_WITH([openssl-header-check], | 2364 | AC_ARG_WITH([openssl-header-check], |
2364 | [ --without-openssl-header-check Disable OpenSSL version consistency check], | 2365 | [ --without-openssl-header-check Disable OpenSSL version consistency check], |
diff --git a/sshbuf-getput-basic.c b/sshbuf-getput-basic.c index 6b16b214d..b7d0758c2 100644 --- a/sshbuf-getput-basic.c +++ b/sshbuf-getput-basic.c | |||
@@ -15,6 +15,7 @@ | |||
15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #define SSHBUF_INTERNAL | ||
18 | #include "includes.h" | 19 | #include "includes.h" |
19 | 20 | ||
20 | #include <sys/types.h> | 21 | #include <sys/types.h> |
@@ -23,7 +24,6 @@ | |||
23 | #include <string.h> | 24 | #include <string.h> |
24 | 25 | ||
25 | #include "ssherr.h" | 26 | #include "ssherr.h" |
26 | #define SSHBUF_INTERNAL | ||
27 | #include "sshbuf.h" | 27 | #include "sshbuf.h" |
28 | 28 | ||
29 | int | 29 | int |
diff --git a/sshbuf-getput-crypto.c b/sshbuf-getput-crypto.c index 9c801a45f..ca1c7ec65 100644 --- a/sshbuf-getput-crypto.c +++ b/sshbuf-getput-crypto.c | |||
@@ -15,6 +15,7 @@ | |||
15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #define SSHBUF_INTERNAL | ||
18 | #include "includes.h" | 19 | #include "includes.h" |
19 | 20 | ||
20 | #include <sys/types.h> | 21 | #include <sys/types.h> |
@@ -26,7 +27,6 @@ | |||
26 | #include <openssl/ec.h> | 27 | #include <openssl/ec.h> |
27 | 28 | ||
28 | #include "ssherr.h" | 29 | #include "ssherr.h" |
29 | #define SSHBUF_INTERNAL | ||
30 | #include "sshbuf.h" | 30 | #include "sshbuf.h" |
31 | 31 | ||
32 | int | 32 | int |
@@ -15,6 +15,7 @@ | |||
15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #define SSHBUF_INTERNAL | ||
18 | #include "includes.h" | 19 | #include "includes.h" |
19 | 20 | ||
20 | #include <sys/types.h> | 21 | #include <sys/types.h> |
@@ -25,7 +26,6 @@ | |||
25 | #include <string.h> | 26 | #include <string.h> |
26 | 27 | ||
27 | #include "ssherr.h" | 28 | #include "ssherr.h" |
28 | #define SSHBUF_INTERNAL | ||
29 | #include "sshbuf.h" | 29 | #include "sshbuf.h" |
30 | 30 | ||
31 | static inline int | 31 | static inline int |