summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/libssl/Makefile.bsd-wrapper6
-rw-r--r--lib/libssl/crypto-patent/Makefile4
-rw-r--r--lib/libssl/crypto/Makefile4
-rw-r--r--lib/libssl/src/Configure1
-rw-r--r--lib/libssl/src/config1
-rw-r--r--lib/libssl/ssl-patent/Makefile4
-rw-r--r--lib/libssl/ssl/Makefile4
7 files changed, 23 insertions, 1 deletions
diff --git a/lib/libssl/Makefile.bsd-wrapper b/lib/libssl/Makefile.bsd-wrapper
index f59a2ea5516..c208db032c5 100644
--- a/lib/libssl/Makefile.bsd-wrapper
+++ b/lib/libssl/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
# Build wrapper for OpenSSL
-# $OpenBSD: Makefile.bsd-wrapper,v 1.23 2000/09/05 08:18:21 deraadt Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.24 2000/10/13 21:31:28 hugh Exp $
# Our lndir is hacked; specify a full path to avoid potential conflicts
# with the one installed with X11.
@@ -17,6 +17,9 @@ SSLCONF= --openssldir=/etc/ssl OpenBSD-mips
.if ${MACHINE_ARCH} == "alpha"
SSLCONF= --openssldir=/etc/ssl OpenBSD-alpha
.else
+.if ${MACHINE_ARCH} == "vax"
+SSLCONF= --openssldir=/etc/ssl OpenBSD-vax
+.else
.if ${MACHINE_ARCH} == "sparc"
SSLCONF= --openssldir=/etc/ssl OpenBSD
.else
@@ -30,6 +33,7 @@ SSLCONF= --openssldir=/etc/ssl OpenBSD
.endif
.endif
.endif
+.endif
MUNGEDFILES = ${.OBJDIR}/${SSL_SRC}/crypto/opensslconf.h ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h ${.OBJDIR}/${SSL_SRC}/Makefile.ssl ${.OBJDIR}/${SSL_SRC}/Makefile ${.OBJDIR}/${SSL_SRC}/apps/der_chop ${.OBJDIR}/${SSL_SRC}/tools/c_rehash
diff --git a/lib/libssl/crypto-patent/Makefile b/lib/libssl/crypto-patent/Makefile
index d5757a12925..24acd06b175 100644
--- a/lib/libssl/crypto-patent/Makefile
+++ b/lib/libssl/crypto-patent/Makefile
@@ -12,12 +12,16 @@ CFLAGS+= -DL_ENDIAN -DBN_ASM
.if ${MACHINE_ARCH} == "mips"
CFLAGS+= -DL_ENDIAN
.else
+.if ${MACHINE_ARCH} == "vax"
+CFLAGS+= -DL_ENDIAN
+.else
.if ${MACHINE_ARCH} == "alpha"
# no ENDIAN stuff defined for alpha
.else
CFLAGS+= -DB_ENDIAN
.endif
.endif
+.endif
.endif
CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH
diff --git a/lib/libssl/crypto/Makefile b/lib/libssl/crypto/Makefile
index 3e525fd72d9..7a3ddaa2c80 100644
--- a/lib/libssl/crypto/Makefile
+++ b/lib/libssl/crypto/Makefile
@@ -12,12 +12,16 @@ CFLAGS+= -DL_ENDIAN -DBN_ASM
.if ${MACHINE_ARCH} == "mips"
CFLAGS+= -DL_ENDIAN
.else
+.if ${MACHINE_ARCH} == "vax"
+CFLAGS+= -DL_ENDIAN
+.else
.if ${MACHINE_ARCH} == "alpha"
# no ENDIAN stuff defined for alpha
.else
CFLAGS+= -DB_ENDIAN
.endif
.endif
+.endif
.endif
CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH
diff --git a/lib/libssl/src/Configure b/lib/libssl/src/Configure
index 8c795f97997..2cd716b4238 100644
--- a/lib/libssl/src/Configure
+++ b/lib/libssl/src/Configure
@@ -363,6 +363,7 @@ my %table=(
# Some OpenBSD from Bob Beck <beck@obtuse.com>
"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::",
+"OpenBSD-vax", "gcc:-DL_ENDIAN -DTERMIOS -O2 -fomit-frame-pointer::(unknown)::BN_LLONG RC2_CHAR RC4_INDEX DES_UNROLL:::",
"OpenBSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
"OpenBSD", "gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::BN_LLONG RC2_CHAR RC4_INDEX DES_UNROLL:::",
"OpenBSD-mips","gcc:-O2 -DL_ENDIAN::(unknown):BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR::::",
diff --git a/lib/libssl/src/config b/lib/libssl/src/config
index f57969bb444..53b219a1f91 100644
--- a/lib/libssl/src/config
+++ b/lib/libssl/src/config
@@ -449,6 +449,7 @@ case "$GUESSOS" in
*86*-*-openbsd) OUT="OpenBSD-x86" ;;
alpha*-*-openbsd) OUT="OpenBSD-alpha" ;;
pmax*-*-openbsd) OUT="OpenBSD-mips" ;;
+ vax*-*-openbsd) OUT="OpenBSD-vax" ;;
*-*-openbsd) OUT="OpenBSD" ;;
*86*-*-bsdi4) OUT="bsdi-elf-gcc" ;;
*-*-osf) OUT="alpha-cc" ;;
diff --git a/lib/libssl/ssl-patent/Makefile b/lib/libssl/ssl-patent/Makefile
index 78acd2183b7..70b3d31eacf 100644
--- a/lib/libssl/ssl-patent/Makefile
+++ b/lib/libssl/ssl-patent/Makefile
@@ -12,6 +12,9 @@ CFLAGS+= -DL_ENDIAN -DBN_ASM
.if ${MACHINE_ARCH} == "mips"
CFLAGS+= -DL_ENDIAN
.else
+.if ${MACHINE_ARCH} == "vax"
+CFLAGS+= -DL_ENDIAN
+.else
.if ${MACHINE_ARCH} == "alpha"
# no ENDIAN stuff defined for alpha
.else
@@ -19,6 +22,7 @@ CFLAGS+= -DB_ENDIAN
.endif
.endif
.endif
+.endif
CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE
CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}/include
diff --git a/lib/libssl/ssl/Makefile b/lib/libssl/ssl/Makefile
index 0f80ee51880..5e0f8ae8c11 100644
--- a/lib/libssl/ssl/Makefile
+++ b/lib/libssl/ssl/Makefile
@@ -12,6 +12,9 @@ CFLAGS+= -DL_ENDIAN -DBN_ASM
.if ${MACHINE_ARCH} == "mips"
CFLAGS+= -DL_ENDIAN
.else
+.if ${MACHINE_ARCH} == "vax"
+CFLAGS+= -DL_ENDIAN
+.else
.if ${MACHINE_ARCH} == "alpha"
# no ENDIAN stuff defined for alpha
.else
@@ -19,6 +22,7 @@ CFLAGS+= -DB_ENDIAN
.endif
.endif
.endif
+.endif
CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE
CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}/include