From 13c662ccd1d22d856f1f2defeea26dd18c0af043 Mon Sep 17 00:00:00 2001 From: djm <> Date: Mon, 5 Jan 2009 21:36:39 +0000 Subject: update to openssl-0.9.8i; tested by several, especially krw@ --- src/lib/libssl/crypto/Makefile | 5 +++-- src/lib/libssl/crypto/arch/alpha/opensslconf.h | 3 +++ src/lib/libssl/crypto/arch/amd64/opensslconf.h | 3 +++ src/lib/libssl/crypto/arch/arm/opensslconf.h | 3 +++ src/lib/libssl/crypto/arch/hppa/opensslconf.h | 3 +++ src/lib/libssl/crypto/arch/i386/opensslconf.h | 3 +++ src/lib/libssl/crypto/arch/m68k/opensslconf.h | 3 +++ src/lib/libssl/crypto/arch/m88k/opensslconf.h | 3 +++ src/lib/libssl/crypto/arch/mips64/opensslconf.h | 3 +++ src/lib/libssl/crypto/arch/powerpc/opensslconf.h | 3 +++ src/lib/libssl/crypto/arch/sh/opensslconf.h | 3 +++ src/lib/libssl/crypto/arch/sparc/opensslconf.h | 3 +++ src/lib/libssl/crypto/arch/sparc64/opensslconf.h | 3 +++ src/lib/libssl/crypto/arch/vax/opensslconf.h | 3 +++ src/lib/libssl/crypto/shlib_version | 2 +- 15 files changed, 43 insertions(+), 3 deletions(-) (limited to 'src/lib/libssl/crypto') diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile index 114e1fc1d4..b1677cd664 100644 --- a/src/lib/libssl/crypto/Makefile +++ b/src/lib/libssl/crypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.49 2008/09/08 07:23:38 djm Exp $ +# $OpenBSD: Makefile,v 1.50 2009/01/05 21:36:37 djm Exp $ LIB= crypto WANTLINT= @@ -36,6 +36,7 @@ CFLAGS+= -DOPENSSL_NO_MDC2 CFLAGS+= -DOPENSSL_NO_HW_4758_CCA CFLAGS+= -DOPENSSL_NO_HW_AEP CFLAGS+= -DOPENSSL_NO_HW_ATALLA +CFLAGS+= -DOPENSSL_NO_CAPIENG CFLAGS+= -DOPENSSL_NO_HW_CSWIFT CFLAGS+= -DOPENSSL_NO_HW_NCIPHER CFLAGS+= -DOPENSSL_NO_HW_NURON @@ -307,7 +308,7 @@ obj_dat.h: obj_mac.h /usr/bin/perl ${SSL_OBJECTS}/obj_dat.pl obj_mac.h obj_dat.h .if (${MACHINE_ARCH} == "vax") -# egcs bombs optimising this file on vax +# egcs bombs optimising these files a_strnid.o: ${CC} ${CFLAGS} -O0 ${CPPFLAGS} -c ${.IMPSRC} a_strnid.po: diff --git a/src/lib/libssl/crypto/arch/alpha/opensslconf.h b/src/lib/libssl/crypto/arch/alpha/opensslconf.h index 0d759a5784..58b46616b5 100644 --- a/src/lib/libssl/crypto/arch/alpha/opensslconf.h +++ b/src/lib/libssl/crypto/arch/alpha/opensslconf.h @@ -7,6 +7,9 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif diff --git a/src/lib/libssl/crypto/arch/amd64/opensslconf.h b/src/lib/libssl/crypto/arch/amd64/opensslconf.h index fd992553a7..b7c7908adf 100644 --- a/src/lib/libssl/crypto/arch/amd64/opensslconf.h +++ b/src/lib/libssl/crypto/arch/amd64/opensslconf.h @@ -7,6 +7,9 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif diff --git a/src/lib/libssl/crypto/arch/arm/opensslconf.h b/src/lib/libssl/crypto/arch/arm/opensslconf.h index 94d322270b..ef50032293 100644 --- a/src/lib/libssl/crypto/arch/arm/opensslconf.h +++ b/src/lib/libssl/crypto/arch/arm/opensslconf.h @@ -7,6 +7,9 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif diff --git a/src/lib/libssl/crypto/arch/hppa/opensslconf.h b/src/lib/libssl/crypto/arch/hppa/opensslconf.h index 94d322270b..ef50032293 100644 --- a/src/lib/libssl/crypto/arch/hppa/opensslconf.h +++ b/src/lib/libssl/crypto/arch/hppa/opensslconf.h @@ -7,6 +7,9 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif diff --git a/src/lib/libssl/crypto/arch/i386/opensslconf.h b/src/lib/libssl/crypto/arch/i386/opensslconf.h index 98b7b58408..b93cff97fc 100644 --- a/src/lib/libssl/crypto/arch/i386/opensslconf.h +++ b/src/lib/libssl/crypto/arch/i386/opensslconf.h @@ -7,6 +7,9 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif diff --git a/src/lib/libssl/crypto/arch/m68k/opensslconf.h b/src/lib/libssl/crypto/arch/m68k/opensslconf.h index 94d322270b..ef50032293 100644 --- a/src/lib/libssl/crypto/arch/m68k/opensslconf.h +++ b/src/lib/libssl/crypto/arch/m68k/opensslconf.h @@ -7,6 +7,9 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif diff --git a/src/lib/libssl/crypto/arch/m88k/opensslconf.h b/src/lib/libssl/crypto/arch/m88k/opensslconf.h index 94d322270b..ef50032293 100644 --- a/src/lib/libssl/crypto/arch/m88k/opensslconf.h +++ b/src/lib/libssl/crypto/arch/m88k/opensslconf.h @@ -7,6 +7,9 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif diff --git a/src/lib/libssl/crypto/arch/mips64/opensslconf.h b/src/lib/libssl/crypto/arch/mips64/opensslconf.h index 0d759a5784..58b46616b5 100644 --- a/src/lib/libssl/crypto/arch/mips64/opensslconf.h +++ b/src/lib/libssl/crypto/arch/mips64/opensslconf.h @@ -7,6 +7,9 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif diff --git a/src/lib/libssl/crypto/arch/powerpc/opensslconf.h b/src/lib/libssl/crypto/arch/powerpc/opensslconf.h index 94d322270b..ef50032293 100644 --- a/src/lib/libssl/crypto/arch/powerpc/opensslconf.h +++ b/src/lib/libssl/crypto/arch/powerpc/opensslconf.h @@ -7,6 +7,9 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif diff --git a/src/lib/libssl/crypto/arch/sh/opensslconf.h b/src/lib/libssl/crypto/arch/sh/opensslconf.h index 94d322270b..ef50032293 100644 --- a/src/lib/libssl/crypto/arch/sh/opensslconf.h +++ b/src/lib/libssl/crypto/arch/sh/opensslconf.h @@ -7,6 +7,9 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif diff --git a/src/lib/libssl/crypto/arch/sparc/opensslconf.h b/src/lib/libssl/crypto/arch/sparc/opensslconf.h index 94d322270b..ef50032293 100644 --- a/src/lib/libssl/crypto/arch/sparc/opensslconf.h +++ b/src/lib/libssl/crypto/arch/sparc/opensslconf.h @@ -7,6 +7,9 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif diff --git a/src/lib/libssl/crypto/arch/sparc64/opensslconf.h b/src/lib/libssl/crypto/arch/sparc64/opensslconf.h index 0d759a5784..58b46616b5 100644 --- a/src/lib/libssl/crypto/arch/sparc64/opensslconf.h +++ b/src/lib/libssl/crypto/arch/sparc64/opensslconf.h @@ -7,6 +7,9 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif diff --git a/src/lib/libssl/crypto/arch/vax/opensslconf.h b/src/lib/libssl/crypto/arch/vax/opensslconf.h index 94d322270b..ef50032293 100644 --- a/src/lib/libssl/crypto/arch/vax/opensslconf.h +++ b/src/lib/libssl/crypto/arch/vax/opensslconf.h @@ -7,6 +7,9 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_CAPIENG +# define OPENSSL_NO_CAPIENG +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif diff --git a/src/lib/libssl/crypto/shlib_version b/src/lib/libssl/crypto/shlib_version index 7791322042..84e2c2920d 100644 --- a/src/lib/libssl/crypto/shlib_version +++ b/src/lib/libssl/crypto/shlib_version @@ -1,2 +1,2 @@ -major=15 +major=16 minor=0 -- cgit v1.2.3-55-g6feb