RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-22 10:00:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) [Makefile.in configure.ac sshbuf-getput-basic.c]

Browse Source 
[sshbuf-getput-crypto.c sshbuf.c] compilation and portability fixes
This commit is contained in:
Damien Miller 2014-05-15 14:58:07 +10:00
parent b9c566788a
commit e5b9f0f2ee
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -89,6 +89,8 @@
OK from djm@ and dtucker@
- (djm) [configure.ac] Unconditionally define WITH_OPENSSL until we write
portability glue to support building without libcrypto
- (djm) [Makefile.in configure.ac sshbuf-getput-basic.c]
[sshbuf-getput-crypto.c sshbuf.c] compilation and portability fixes
20140430
- (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already

12
Makefile.in
View File

@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.356 2014/02/04 00:12:56 djm Exp $
# $Id: Makefile.in,v 1.357 2014/05/15 04:58:08 djm Exp $
# uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@
@ -63,7 +63,15 @@ MANFMT=@MANFMT@
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)
LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \
LIBOPENSSH_OBJS=\
ssherr.o \
sshbuf.o \
sshbuf-getput-basic.o \
sshbuf-misc.o \
sshbuf-getput-crypto.o
LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
authfd.o authfile.o bufaux.o bufbn.o buffer.o \
canohost.o channels.o cipher.o cipher-aes.o \
cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \

5
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.572 2014/05/15 04:43:38 djm Exp $
# $Id: configure.ac,v 1.573 2014/05/15 04:58:08 djm Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
AC_REVISION($Revision: 1.572 $)
AC_REVISION($Revision: 1.573 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C])
@ -2359,6 +2359,7 @@ AC_RUN_IFELSE(
# XXX make --without-openssl work
AC_DEFINE_UNQUOTED([WITH_OPENSSL], [1], [use libcrypto for cryptography])
AC_DEFINE_UNQUOTED([WITH_SSH1], [1], [include SSH protocol version 1 support])
AC_ARG_WITH([openssl-header-check],
[ --without-openssl-header-check Disable OpenSSL version consistency check],

2
sshbuf-getput-basic.c
View File

@ -15,6 +15,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#define SSHBUF_INTERNAL
#include "includes.h"
#include <sys/types.h>
@ -23,7 +24,6 @@
#include <string.h>
#include "ssherr.h"
#define SSHBUF_INTERNAL
#include "sshbuf.h"
int

2
sshbuf-getput-crypto.c
View File

@ -15,6 +15,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#define SSHBUF_INTERNAL
#include "includes.h"
#include <sys/types.h>
@ -26,7 +27,6 @@
#include <openssl/ec.h>
#include "ssherr.h"
#define SSHBUF_INTERNAL
#include "sshbuf.h"
int

2
sshbuf.c
View File

@ -15,6 +15,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#define SSHBUF_INTERNAL
#include "includes.h"
#include <sys/types.h>
@ -25,7 +26,6 @@
#include <string.h>
#include "ssherr.h"
#define SSHBUF_INTERNAL
#include "sshbuf.h"
static inline int