summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/arch
diff options
context:
space:
mode:
authorcvs2svn <admin@example.com>2015-08-02 21:54:22 +0000
committercvs2svn <admin@example.com>2015-08-02 21:54:22 +0000
commited3760bf4be4a96a89233fb8f8b84a0d44725862 (patch)
tree5609c82060f75c53af0a7641d9b33a88574876cd /src/lib/libcrypto/arch
parentf8b563fb5ba1524c821d37308f4e6abfc866bc3f (diff)
downloadopenbsd-OPENBSD_5_8_BASE.tar.gz
openbsd-OPENBSD_5_8_BASE.tar.bz2
openbsd-OPENBSD_5_8_BASE.zip
This commit was manufactured by cvs2git to create tag 'OPENBSD_5_8_BASE'.OPENBSD_5_8_BASE
Diffstat (limited to 'src/lib/libcrypto/arch')
-rw-r--r--src/lib/libcrypto/arch/alpha/Makefile.inc43
-rw-r--r--src/lib/libcrypto/arch/alpha/opensslconf.h155
-rw-r--r--src/lib/libcrypto/arch/amd64/Makefile.inc75
-rw-r--r--src/lib/libcrypto/arch/amd64/opensslconf.h152
-rw-r--r--src/lib/libcrypto/arch/arm/Makefile.inc47
-rw-r--r--src/lib/libcrypto/arch/arm/opensslconf.h157
-rw-r--r--src/lib/libcrypto/arch/hppa/Makefile.inc51
-rw-r--r--src/lib/libcrypto/arch/hppa/opensslconf.h157
-rw-r--r--src/lib/libcrypto/arch/i386/Makefile.inc66
-rw-r--r--src/lib/libcrypto/arch/i386/opensslconf.h157
-rw-r--r--src/lib/libcrypto/arch/m88k/opensslconf.h157
-rw-r--r--src/lib/libcrypto/arch/mips64/Makefile.inc44
-rw-r--r--src/lib/libcrypto/arch/mips64/opensslconf.h157
-rw-r--r--src/lib/libcrypto/arch/powerpc/Makefile.inc46
-rw-r--r--src/lib/libcrypto/arch/powerpc/opensslconf.h157
-rw-r--r--src/lib/libcrypto/arch/sh/opensslconf.h157
-rw-r--r--src/lib/libcrypto/arch/sparc/Makefile.inc29
-rw-r--r--src/lib/libcrypto/arch/sparc/opensslconf.h157
-rw-r--r--src/lib/libcrypto/arch/sparc64/Makefile.inc48
-rw-r--r--src/lib/libcrypto/arch/sparc64/opensslconf.h157
-rw-r--r--src/lib/libcrypto/arch/vax/Makefile.inc21
-rw-r--r--src/lib/libcrypto/arch/vax/bn_asm_vax.S436
-rw-r--r--src/lib/libcrypto/arch/vax/opensslconf.h157
23 files changed, 0 insertions, 2783 deletions
diff --git a/src/lib/libcrypto/arch/alpha/Makefile.inc b/src/lib/libcrypto/arch/alpha/Makefile.inc
deleted file mode 100644
index 82fa9fc1f4..0000000000
--- a/src/lib/libcrypto/arch/alpha/Makefile.inc
+++ /dev/null
@@ -1,43 +0,0 @@
1# $OpenBSD: Makefile.inc,v 1.3 2014/11/17 20:31:21 miod Exp $
2
3# alpha-specific libcrypto build rules
4
5# aes
6SRCS+= aes_core.c aes_cbc.c
7# bf
8SRCS+= bf_enc.c
9# bn
10SRCS+= bn_asm.c
11SSLASM+= bn alpha-mont
12CFLAGS+= -DOPENSSL_BN_ASM_MONT
13# camellia
14SRCS+= camellia.c cmll_cbc.c cmll_misc.c
15# des
16SRCS+= des_enc.c fcrypt_b.c
17# modes
18CFLAGS+= -DGHASH_ASM
19SSLASM+= modes ghash-alpha
20# rc4
21SRCS+= rc4_enc.c rc4_skey.c
22## rc5
23#SRCS+= rc5_enc.c
24# sha
25CFLAGS+= -DSHA1_ASM
26SSLASM+= sha sha1-alpha
27# whrlpool
28SRCS+= wp_block.c
29
30.for dir f in ${SSLASM}
31SRCS+= ${f}.S
32GENERATED+=${f}.S
33${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl
34 /usr/bin/perl \
35 ${LCRYPTO_SRC}/${dir}/asm/${f}.pl > ${.TARGET}
36.endfor
37
38CFLAGS+= -DOPENSSL_CPUID_OBJ
39SRCS+= alphacpuid.S
40GENERATED+=alphacpuid.S
41alphacpuid.S: ${LCRYPTO_SRC}/alphacpuid.pl
42 /usr/bin/perl \
43 ${LCRYPTO_SRC}/alphacpuid.pl > ${.TARGET}
diff --git a/src/lib/libcrypto/arch/alpha/opensslconf.h b/src/lib/libcrypto/arch/alpha/opensslconf.h
deleted file mode 100644
index a74c6df644..0000000000
--- a/src/lib/libcrypto/arch/alpha/opensslconf.h
+++ /dev/null
@@ -1,155 +0,0 @@
1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */
3
4/* Generate 80386 code? */
5#undef I386_ONLY
6
7#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
8#define OPENSSLDIR "/etc/ssl"
9#endif
10
11#undef OPENSSL_UNISTD
12#define OPENSSL_UNISTD <unistd.h>
13
14#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
15
16#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
17#define IDEA_INT unsigned int
18#endif
19
20#if defined(HEADER_MD2_H) && !defined(MD2_INT)
21#define MD2_INT unsigned int
22#endif
23
24#if defined(HEADER_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK)
41/*
42 * This enables code handling data aligned at natural CPU word
43 * boundary. See crypto/rc4/rc4_enc.c for further details.
44 */
45#define RC4_CHUNK unsigned long
46#endif
47#endif
48
49#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H
59#undef BN_LLONG
60
61/* Should we define BN_DIV2W here? */
62
63/* Only one for the following should be defined */
64/* The prime number generation stuff may not work when
65 * EIGHT_BIT but I don't care since I've only used this mode
66 * for debuging the bignum libraries */
67#define SIXTY_FOUR_BIT_LONG
68#undef SIXTY_FOUR_BIT
69#undef THIRTY_TWO_BIT
70#endif
71
72#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
73#define CONFIG_HEADER_RC4_LOCL_H
74/* if this is defined data[i] is used instead of *data, this is a %20
75 * speedup on x86 */
76#undef RC4_INDEX
77#endif
78
79#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
80#define CONFIG_HEADER_BF_LOCL_H
81#define BF_PTR
82#endif /* HEADER_BF_LOCL_H */
83
84#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
85#define CONFIG_HEADER_DES_LOCL_H
86#ifndef DES_DEFAULT_OPTIONS
87/* the following is tweaked from a config script, that is why it is a
88 * protected undef/define */
89#ifndef DES_PTR
90#define DES_PTR
91#endif
92
93/* This helps C compiler generate the correct code for multiple functional
94 * units. It reduces register dependancies at the expense of 2 more
95 * registers */
96#ifndef DES_RISC1
97#undef DES_RISC1
98#endif
99
100#ifndef DES_RISC2
101#define DES_RISC2
102#endif
103
104#if defined(DES_RISC1) && defined(DES_RISC2)
105YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
106#endif
107
108/* Unroll the inner loop, this sometimes helps, sometimes hinders.
109 * Very mucy CPU dependant */
110#ifndef DES_UNROLL
111#undef DES_UNROLL
112#endif
113
114/* These default values were supplied by
115 * Peter Gutman <pgut001@cs.auckland.ac.nz>
116 * They are only used if nothing else has been defined */
117#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
118/* Special defines which change the way the code is built depending on the
119 CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
120 even newer MIPS CPU's, but at the moment one size fits all for
121 optimization options. Older Sparc's work better with only UNROLL, but
122 there's no way to tell at compile time what it is you're running on */
123
124#if defined( sun ) /* Newer Sparc's */
125# define DES_PTR
126# define DES_RISC1
127# define DES_UNROLL
128#elif defined( __ultrix ) /* Older MIPS */
129# define DES_PTR
130# define DES_RISC2
131# define DES_UNROLL
132#elif defined( __osf1__ ) /* Alpha */
133# define DES_PTR
134# define DES_RISC2
135#elif defined ( _AIX ) /* RS6000 */
136 /* Unknown */
137#elif defined( __hpux ) /* HP-PA */
138 /* Unknown */
139#elif defined( __aux ) /* 68K */
140 /* Unknown */
141#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
142# define DES_UNROLL
143#elif defined( __sgi ) /* Newer MIPS */
144# define DES_PTR
145# define DES_RISC2
146# define DES_UNROLL
147#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
148# define DES_PTR
149# define DES_RISC1
150# define DES_UNROLL
151#endif /* Systems-specific speed defines */
152#endif
153
154#endif /* DES_DEFAULT_OPTIONS */
155#endif /* HEADER_DES_LOCL_H */
diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc
deleted file mode 100644
index 3f92196451..0000000000
--- a/src/lib/libcrypto/arch/amd64/Makefile.inc
+++ /dev/null
@@ -1,75 +0,0 @@
1# $OpenBSD: Makefile.inc,v 1.4 2014/11/17 20:31:21 miod Exp $
2
3# amd64-specific libcrypto build rules
4
5# aes
6CFLAGS+= -DAES_ASM
7SSLASM+= aes aes-x86_64
8CFLAGS+= -DBSAES_ASM
9SSLASM+= aes bsaes-x86_64
10CFLAGS+= -DVPAES_ASM
11SSLASM+= aes vpaes-x86_64
12SSLASM+= aes aesni-x86_64
13SSLASM+= aes aesni-sha1-x86_64
14# bf
15SRCS+= bf_enc.c
16# bn
17CFLAGS+= -DOPENSSL_IA32_SSE2
18CFLAGS+= -DRSA_ASM
19SSLASM+= bn modexp512-x86_64
20CFLAGS+= -DOPENSSL_BN_ASM_MONT
21SSLASM+= bn x86_64-mont
22CFLAGS+= -DOPENSSL_BN_ASM_MONT5
23SSLASM+= bn x86_64-mont5
24CFLAGS+= -DOPENSSL_BN_ASM_GF2m
25SSLASM+= bn x86_64-gf2m
26# camellia
27SRCS+= cmll_misc.c
28SSLASM+= camellia cmll-x86_64
29# des
30SRCS+= des_enc.c fcrypt_b.c
31# md5
32CFLAGS+= -DMD5_ASM
33SSLASM+= md5 md5-x86_64
34# modes
35CFLAGS+= -DGHASH_ASM
36SSLASM+= modes ghash-x86_64
37# rc4
38CFLAGS+= -DRC4_MD5_ASM
39SSLASM+= rc4 rc4-x86_64
40SSLASM+= rc4 rc4-md5-x86_64
41# ripemd
42# sha
43CFLAGS+= -DSHA1_ASM
44SSLASM+= sha sha1-x86_64
45CFLAGS+= -DSHA256_ASM
46SRCS+= sha256-x86_64.S
47GENERATED+= sha256-x86_64.S
48sha256-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl
49 cd ${LCRYPTO_SRC}/sha/asm ; \
50 /usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET}
51CFLAGS+= -DSHA512_ASM
52SRCS+= sha512-x86_64.S
53GENERATED+= sha512-x86_64.S
54sha512-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl
55 cd ${LCRYPTO_SRC}/sha/asm ; \
56 /usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET}
57# whrlpool
58CFLAGS+= -DWHIRLPOOL_ASM
59SSLASM+= whrlpool wp-x86_64
60
61.for dir f in ${SSLASM}
62SRCS+= ${f}.S
63GENERATED+=${f}.S
64${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl
65 (cd ${LCRYPTO_SRC}/${dir} ; \
66 /usr/bin/perl ./asm/${f}.pl openbsd-elf) > ${.TARGET}
67.endfor
68
69CFLAGS+= -DOPENSSL_CPUID_OBJ
70SRCS+= x86_64cpuid.S x86_64-gcc.c
71GENERATED+=x86_64cpuid.S
72
73x86_64cpuid.S: ${LCRYPTO_SRC}/x86_64cpuid.pl
74 (cd ${LCRYPTO_SRC}/${dir} ; \
75 /usr/bin/perl ./x86_64cpuid.pl) > ${.TARGET}
diff --git a/src/lib/libcrypto/arch/amd64/opensslconf.h b/src/lib/libcrypto/arch/amd64/opensslconf.h
deleted file mode 100644
index cbd5d53ca4..0000000000
--- a/src/lib/libcrypto/arch/amd64/opensslconf.h
+++ /dev/null
@@ -1,152 +0,0 @@
1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */
3
4/* Generate 80386 code? */
5#undef I386_ONLY
6
7#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
8#define OPENSSLDIR "/etc/ssl"
9#endif
10
11#undef OPENSSL_UNISTD
12#define OPENSSL_UNISTD <unistd.h>
13
14#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
15
16#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
17#define IDEA_INT unsigned int
18#endif
19
20#if defined(HEADER_MD2_H) && !defined(MD2_INT)
21#define MD2_INT unsigned int
22#endif
23
24#if defined(HEADER_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK)
41/*
42 * This enables code handling data aligned at natural CPU word
43 * boundary. See crypto/rc4/rc4_enc.c for further details.
44 */
45#define RC4_CHUNK unsigned long
46#endif
47#endif
48
49#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H
59#undef BN_LLONG
60
61/* Should we define BN_DIV2W here? */
62
63/* Only one for the following should be defined */
64#define SIXTY_FOUR_BIT_LONG
65#undef SIXTY_FOUR_BIT
66#undef THIRTY_TWO_BIT
67#endif
68
69#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
70#define CONFIG_HEADER_RC4_LOCL_H
71/* if this is defined data[i] is used instead of *data, this is a %20
72 * speedup on x86 */
73#undef RC4_INDEX
74#endif
75
76#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
77#define CONFIG_HEADER_BF_LOCL_H
78#undef BF_PTR
79#endif /* HEADER_BF_LOCL_H */
80
81#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
82#define CONFIG_HEADER_DES_LOCL_H
83#ifndef DES_DEFAULT_OPTIONS
84/* the following is tweaked from a config script, that is why it is a
85 * protected undef/define */
86#ifndef DES_PTR
87#undef DES_PTR
88#endif
89
90/* This helps C compiler generate the correct code for multiple functional
91 * units. It reduces register dependancies at the expense of 2 more
92 * registers */
93#ifndef DES_RISC1
94#undef DES_RISC1
95#endif
96
97#ifndef DES_RISC2
98#undef DES_RISC2
99#endif
100
101#if defined(DES_RISC1) && defined(DES_RISC2)
102YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
103#endif
104
105/* Unroll the inner loop, this sometimes helps, sometimes hinders.
106 * Very mucy CPU dependant */
107#ifndef DES_UNROLL
108#define DES_UNROLL
109#endif
110
111/* These default values were supplied by
112 * Peter Gutman <pgut001@cs.auckland.ac.nz>
113 * They are only used if nothing else has been defined */
114#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
115/* Special defines which change the way the code is built depending on the
116 CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
117 even newer MIPS CPU's, but at the moment one size fits all for
118 optimization options. Older Sparc's work better with only UNROLL, but
119 there's no way to tell at compile time what it is you're running on */
120
121#if defined( sun ) /* Newer Sparc's */
122# define DES_PTR
123# define DES_RISC1
124# define DES_UNROLL
125#elif defined( __ultrix ) /* Older MIPS */
126# define DES_PTR
127# define DES_RISC2
128# define DES_UNROLL
129#elif defined( __osf1__ ) /* Alpha */
130# define DES_PTR
131# define DES_RISC2
132#elif defined ( _AIX ) /* RS6000 */
133 /* Unknown */
134#elif defined( __hpux ) /* HP-PA */
135 /* Unknown */
136#elif defined( __aux ) /* 68K */
137 /* Unknown */
138#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
139# define DES_UNROLL
140#elif defined( __sgi ) /* Newer MIPS */
141# define DES_PTR
142# define DES_RISC2
143# define DES_UNROLL
144#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
145# define DES_PTR
146# define DES_RISC1
147# define DES_UNROLL
148#endif /* Systems-specific speed defines */
149#endif
150
151#endif /* DES_DEFAULT_OPTIONS */
152#endif /* HEADER_DES_LOCL_H */
diff --git a/src/lib/libcrypto/arch/arm/Makefile.inc b/src/lib/libcrypto/arch/arm/Makefile.inc
deleted file mode 100644
index 22145a79cc..0000000000
--- a/src/lib/libcrypto/arch/arm/Makefile.inc
+++ /dev/null
@@ -1,47 +0,0 @@
1# $oPenBSD: Makefile.inc,v 1.2 2014/05/02 18:21:39 miod Exp $
2
3# arm-specific libcrypto build rules
4
5# aes
6SRCS+= aes_cbc.c
7CFLAGS+= -DAES_ASM
8SSLASM+= aes aes-armv4
9# bf
10SRCS+= bf_enc.c
11# bn
12SRCS+= bn_asm.c
13CFLAGS+= -DOPENSSL_BN_ASM_MONT
14SSLASM+= bn armv4-mont
15CFLAGS+= -DOPENSSL_BN_ASM_GF2m
16SSLASM+= bn armv4-gf2m
17# camellia
18SRCS+= camellia.c cmll_cbc.c cmll_misc.c
19# des
20SRCS+= des_enc.c fcrypt_b.c
21# modes
22CFLAGS+= -DGHASH_ASM
23SSLASM+= modes ghash-armv4
24# rc4
25SRCS+= rc4_enc.c rc4_skey.c
26## rc5
27#SRCS+= rc5_enc.c
28# sha
29CFLAGS+= -DSHA1_ASM
30SSLASM+= sha sha1-armv4-large
31CFLAGS+= -DSHA256_ASM
32SSLASM+= sha sha256-armv4
33CFLAGS+= -DSHA512_ASM
34SSLASM+= sha sha512-armv4
35# whrlpool
36SRCS+= wp_block.c
37
38.for dir f in ${SSLASM}
39SRCS+= ${f}.S
40GENERATED+=${f}.S
41${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl
42 /usr/bin/perl \
43 ${LCRYPTO_SRC}/${dir}/asm/${f}.pl void ${.TARGET} > ${.TARGET}
44.endfor
45
46CFLAGS+= -DOPENSSL_CPUID_OBJ
47SRCS+= armv4cpuid.S armcap.c
diff --git a/src/lib/libcrypto/arch/arm/opensslconf.h b/src/lib/libcrypto/arch/arm/opensslconf.h
deleted file mode 100644
index e3795ce73a..0000000000
--- a/src/lib/libcrypto/arch/arm/opensslconf.h
+++ /dev/null
@@ -1,157 +0,0 @@
1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */
3
4/* Generate 80386 code? */
5#undef I386_ONLY
6
7#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
8#define OPENSSLDIR "/etc/ssl"
9#endif
10
11#undef OPENSSL_UNISTD
12#define OPENSSL_UNISTD <unistd.h>
13
14#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
15
16#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
17#define IDEA_INT unsigned int
18#endif
19
20#if defined(HEADER_MD2_H) && !defined(MD2_INT)
21#define MD2_INT unsigned int
22#endif
23
24#if defined(HEADER_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK)
41/*
42 * This enables code handling data aligned at natural CPU word
43 * boundary. See crypto/rc4/rc4_enc.c for further details.
44 */
45#undef RC4_CHUNK
46#endif
47#endif
48
49#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H
59#define BN_LLONG
60
61/* Should we define BN_DIV2W here? */
62
63/* Only one for the following should be defined */
64/* The prime number generation stuff may not work when
65 * EIGHT_BIT but I don't care since I've only used this mode
66 * for debuging the bignum libraries */
67#undef SIXTY_FOUR_BIT_LONG
68#undef SIXTY_FOUR_BIT
69#define THIRTY_TWO_BIT
70#undef SIXTEEN_BIT
71#undef EIGHT_BIT
72#endif
73
74#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
75#define CONFIG_HEADER_RC4_LOCL_H
76/* if this is defined data[i] is used instead of *data, this is a %20
77 * speedup on x86 */
78#define RC4_INDEX
79#endif
80
81#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
82#define CONFIG_HEADER_BF_LOCL_H
83#undef BF_PTR
84#endif /* HEADER_BF_LOCL_H */
85
86#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
87#define CONFIG_HEADER_DES_LOCL_H
88#ifndef DES_DEFAULT_OPTIONS
89/* the following is tweaked from a config script, that is why it is a
90 * protected undef/define */
91#ifndef DES_PTR
92#undef DES_PTR
93#endif
94
95/* This helps C compiler generate the correct code for multiple functional
96 * units. It reduces register dependancies at the expense of 2 more
97 * registers */
98#ifndef DES_RISC1
99#undef DES_RISC1
100#endif
101
102#ifndef DES_RISC2
103#undef DES_RISC2
104#endif
105
106#if defined(DES_RISC1) && defined(DES_RISC2)
107YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
108#endif
109
110/* Unroll the inner loop, this sometimes helps, sometimes hinders.
111 * Very mucy CPU dependant */
112#ifndef DES_UNROLL
113#define DES_UNROLL
114#endif
115
116/* These default values were supplied by
117 * Peter Gutman <pgut001@cs.auckland.ac.nz>
118 * They are only used if nothing else has been defined */
119#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
120/* Special defines which change the way the code is built depending on the
121 CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
122 even newer MIPS CPU's, but at the moment one size fits all for
123 optimization options. Older Sparc's work better with only UNROLL, but
124 there's no way to tell at compile time what it is you're running on */
125
126#if defined( sun ) /* Newer Sparc's */
127# define DES_PTR
128# define DES_RISC1
129# define DES_UNROLL
130#elif defined( __ultrix ) /* Older MIPS */
131# define DES_PTR
132# define DES_RISC2
133# define DES_UNROLL
134#elif defined( __osf1__ ) /* Alpha */
135# define DES_PTR
136# define DES_RISC2
137#elif defined ( _AIX ) /* RS6000 */
138 /* Unknown */
139#elif defined( __hpux ) /* HP-PA */
140 /* Unknown */
141#elif defined( __aux ) /* 68K */
142 /* Unknown */
143#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
144# define DES_UNROLL
145#elif defined( __sgi ) /* Newer MIPS */
146# define DES_PTR
147# define DES_RISC2
148# define DES_UNROLL
149#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
150# define DES_PTR
151# define DES_RISC1
152# define DES_UNROLL
153#endif /* Systems-specific speed defines */
154#endif
155
156#endif /* DES_DEFAULT_OPTIONS */
157#endif /* HEADER_DES_LOCL_H */
diff --git a/src/lib/libcrypto/arch/hppa/Makefile.inc b/src/lib/libcrypto/arch/hppa/Makefile.inc
deleted file mode 100644
index 0e18de2074..0000000000
--- a/src/lib/libcrypto/arch/hppa/Makefile.inc
+++ /dev/null
@@ -1,51 +0,0 @@
1# $OpenBSD: Makefile.inc,v 1.9 2015/03/18 05:26:10 miod Exp $
2
3# hppa-specific libcrypto build rules
4
5# aes
6SRCS+= aes_core.c aes_cbc.c
7CFLAGS+= -DAES_ASM
8SSLASM+= aes aes-parisc aes-parisc
9# bf
10SRCS+= bf_enc.c
11# bn
12SRCS+= bn_asm.c
13SSLASM+= bn parisc-mont parisc-mont
14CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV2W
15# camellia
16SRCS+= camellia.c cmll_cbc.c cmll_misc.c
17# des
18SRCS+= des_enc.c fcrypt_b.c
19# modes
20CFLAGS+= -DGHASH_ASM
21SSLASM+= modes ghash-parisc ghash-parisc
22# rc4
23.if 0 # about 35% slower than C code
24SSLASM+= rc4 rc4-parisc rc4-parisc
25.else
26SRCS+= rc4_enc.c rc4_skey.c
27.endif
28## rc5
29#SRCS+= rc5_enc.c
30# sha
31CFLAGS+= -DSHA1_ASM
32SSLASM+= sha sha1-parisc sha1-parisc
33CFLAGS+= -DSHA256_ASM
34SSLASM+= sha sha512-parisc sha256-parisc
35# whrlpool
36SRCS+= wp_block.c
37
38.for dir src dst in ${SSLASM}
39SRCS+= ${dst}.S
40GENERATED+=${dst}.S
41${dst}.S: ${LCRYPTO_SRC}/${dir}/asm/${src}.pl
42 /usr/bin/perl \
43 ${LCRYPTO_SRC}/${dir}/asm/${src}.pl 32 ${.TARGET} > ${.TARGET}
44.endfor
45
46CFLAGS+= -DOPENSSL_CPUID_OBJ
47SRCS+= pariscid.S
48GENERATED+=pariscid.S
49pariscid.S: ${LCRYPTO_SRC}/pariscid.pl
50 /usr/bin/perl \
51 ${LCRYPTO_SRC}/pariscid.pl 32 > ${.TARGET}
diff --git a/src/lib/libcrypto/arch/hppa/opensslconf.h b/src/lib/libcrypto/arch/hppa/opensslconf.h
deleted file mode 100644
index e3795ce73a..0000000000
--- a/src/lib/libcrypto/arch/hppa/opensslconf.h
+++ /dev/null
@@ -1,157 +0,0 @@
1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */
3
4/* Generate 80386 code? */
5#undef I386_ONLY
6
7#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
8#define OPENSSLDIR "/etc/ssl"
9#endif
10
11#undef OPENSSL_UNISTD
12#define OPENSSL_UNISTD <unistd.h>
13
14#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
15
16#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
17#define IDEA_INT unsigned int
18#endif
19
20#if defined(HEADER_MD2_H) && !defined(MD2_INT)
21#define MD2_INT unsigned int
22#endif
23
24#if defined(HEADER_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK)
41/*
42 * This enables code handling data aligned at natural CPU word
43 * boundary. See crypto/rc4/rc4_enc.c for further details.
44 */
45#undef RC4_CHUNK
46#endif
47#endif
48
49#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H
59#define BN_LLONG
60
61/* Should we define BN_DIV2W here? */
62
63/* Only one for the following should be defined */
64/* The prime number generation stuff may not work when
65 * EIGHT_BIT but I don't care since I've only used this mode
66 * for debuging the bignum libraries */
67#undef SIXTY_FOUR_BIT_LONG
68#undef SIXTY_FOUR_BIT
69#define THIRTY_TWO_BIT
70#undef SIXTEEN_BIT
71#undef EIGHT_BIT
72#endif
73
74#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
75#define CONFIG_HEADER_RC4_LOCL_H
76/* if this is defined data[i] is used instead of *data, this is a %20
77 * speedup on x86 */
78#define RC4_INDEX
79#endif
80
81#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
82#define CONFIG_HEADER_BF_LOCL_H
83#undef BF_PTR
84#endif /* HEADER_BF_LOCL_H */
85
86#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
87#define CONFIG_HEADER_DES_LOCL_H
88#ifndef DES_DEFAULT_OPTIONS
89/* the following is tweaked from a config script, that is why it is a
90 * protected undef/define */
91#ifndef DES_PTR
92#undef DES_PTR
93#endif
94
95/* This helps C compiler generate the correct code for multiple functional
96 * units. It reduces register dependancies at the expense of 2 more
97 * registers */
98#ifndef DES_RISC1
99#undef DES_RISC1
100#endif
101
102#ifndef DES_RISC2
103#undef DES_RISC2
104#endif
105
106#if defined(DES_RISC1) && defined(DES_RISC2)
107YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
108#endif
109
110/* Unroll the inner loop, this sometimes helps, sometimes hinders.
111 * Very mucy CPU dependant */
112#ifndef DES_UNROLL
113#define DES_UNROLL
114#endif
115
116/* These default values were supplied by
117 * Peter Gutman <pgut001@cs.auckland.ac.nz>
118 * They are only used if nothing else has been defined */
119#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
120/* Special defines which change the way the code is built depending on the
121 CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
122 even newer MIPS CPU's, but at the moment one size fits all for
123 optimization options. Older Sparc's work better with only UNROLL, but
124 there's no way to tell at compile time what it is you're running on */
125
126#if defined( sun ) /* Newer Sparc's */
127# define DES_PTR
128# define DES_RISC1
129# define DES_UNROLL
130#elif defined( __ultrix ) /* Older MIPS */
131# define DES_PTR
132# define DES_RISC2
133# define DES_UNROLL
134#elif defined( __osf1__ ) /* Alpha */
135# define DES_PTR
136# define DES_RISC2
137#elif defined ( _AIX ) /* RS6000 */
138 /* Unknown */
139#elif defined( __hpux ) /* HP-PA */
140 /* Unknown */
141#elif defined( __aux ) /* 68K */
142 /* Unknown */
143#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
144# define DES_UNROLL
145#elif defined( __sgi ) /* Newer MIPS */
146# define DES_PTR
147# define DES_RISC2
148# define DES_UNROLL
149#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
150# define DES_PTR
151# define DES_RISC1
152# define DES_UNROLL
153#endif /* Systems-specific speed defines */
154#endif
155
156#endif /* DES_DEFAULT_OPTIONS */
157#endif /* HEADER_DES_LOCL_H */
diff --git a/src/lib/libcrypto/arch/i386/Makefile.inc b/src/lib/libcrypto/arch/i386/Makefile.inc
deleted file mode 100644
index f4e1f36b1c..0000000000
--- a/src/lib/libcrypto/arch/i386/Makefile.inc
+++ /dev/null
@@ -1,66 +0,0 @@
1# $OpenBSD: Makefile.inc,v 1.4 2014/11/17 20:31:22 miod Exp $
2
3# i386-specific libcrypto build rules
4
5# aes
6CFLAGS+= -DAES_ASM
7SSLASM+= aes aes-586
8CFLAGS+= -DVPAES_ASM
9SSLASM+= aes vpaes-x86
10SSLASM+= aes aesni-x86
11# bf
12SRCS+= bf_cbc.c
13SSLASM+= bf bf-586
14# bn
15CFLAGS+= -DOPENSSL_IA32_SSE2
16CFLAGS+= -DOPENSSL_BN_ASM_PART_WORDS
17SSLASM+= bn bn-586
18SSLASM+= bn co-586
19CFLAGS+= -DOPENSSL_BN_ASM_MONT
20SSLASM+= bn x86-mont
21CFLAGS+= -DOPENSSL_BN_ASM_GF2m
22SSLASM+= bn x86-gf2m
23# camellia
24SSLASM+= camellia cmll-x86
25# des
26SRCS+= fcrypt_b.c
27SSLASM+= des des-586
28# md5
29CFLAGS+= -DMD5_ASM
30SSLASM+= md5 md5-586
31# modes
32CFLAGS+= -DGHASH_ASM
33SSLASM+= modes ghash-x86
34# rc4
35SSLASM+= rc4 rc4-586
36# ripemd
37CFLAGS+= -DRMD160_ASM
38SSLASM+= ripemd rmd-586
39# sha
40CFLAGS+= -DSHA1_ASM
41SSLASM+= sha sha1-586
42CFLAGS+= -DSHA256_ASM
43SSLASM+= sha sha256-586
44CFLAGS+= -DSHA512_ASM
45SSLASM+= sha sha512-586
46# whrlpool
47SRCS+= wp_block.c
48CFLAGS+= -DWHIRLPOOL_ASM
49SSLASM+= whrlpool wp-mmx
50
51.for dir f in ${SSLASM}
52SRCS+= ${f}.S
53GENERATED+=${f}.S
54${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl ${LCRYPTO_SRC}/perlasm/x86gas.pl
55 /usr/bin/perl -I${LCRYPTO_SRC}/perlasm -I${LCRYPTO_SRC}/${dir}/asm \
56 ${LCRYPTO_SRC}/${dir}/asm/${f}.pl \
57 openbsd-elf ${CFLAGS} 386 ${PICFLAG} > ${.TARGET}
58.endfor
59
60CFLAGS+= -DOPENSSL_CPUID_OBJ
61SRCS+= x86cpuid.S
62GENERATED+=x86cpuid.S
63
64x86cpuid.S: ${LCRYPTO_SRC}/x86cpuid.pl ${LCRYPTO_SRC}/perlasm/x86gas.pl
65 /usr/bin/perl -I${LCRYPTO_SRC}/perlasm ${LCRYPTO_SRC}/x86cpuid.pl \
66 openbsd-elf ${CFLAGS} 386 ${PICFLAG} > ${.TARGET}
diff --git a/src/lib/libcrypto/arch/i386/opensslconf.h b/src/lib/libcrypto/arch/i386/opensslconf.h
deleted file mode 100644
index 37137ff102..0000000000
--- a/src/lib/libcrypto/arch/i386/opensslconf.h
+++ /dev/null
@@ -1,157 +0,0 @@
1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */
3
4/* Generate 80386 code? */
5#undef I386_ONLY
6
7#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
8#define OPENSSLDIR "/etc/ssl"
9#endif
10
11#undef OPENSSL_UNISTD
12#define OPENSSL_UNISTD <unistd.h>
13
14#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
15
16#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
17#define IDEA_INT unsigned int
18#endif
19
20#if defined(HEADER_MD2_H) && !defined(MD2_INT)
21#define MD2_INT unsigned int
22#endif
23
24#if defined(HEADER_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK)
41/*
42 * This enables code handling data aligned at natural CPU word
43 * boundary. See crypto/rc4/rc4_enc.c for further details.
44 */
45#undef RC4_CHUNK
46#endif
47#endif
48
49#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned long
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H
59#define BN_LLONG
60
61/* Should we define BN_DIV2W here? */
62
63/* Only one for the following should be defined */
64/* The prime number generation stuff may not work when
65 * EIGHT_BIT but I don't care since I've only used this mode
66 * for debuging the bignum libraries */
67#undef SIXTY_FOUR_BIT_LONG
68#undef SIXTY_FOUR_BIT
69#define THIRTY_TWO_BIT
70#undef SIXTEEN_BIT
71#undef EIGHT_BIT
72#endif
73
74#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
75#define CONFIG_HEADER_RC4_LOCL_H
76/* if this is defined data[i] is used instead of *data, this is a %20
77 * speedup on x86 */
78#define RC4_INDEX
79#endif
80
81#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
82#define CONFIG_HEADER_BF_LOCL_H
83#undef BF_PTR
84#endif /* HEADER_BF_LOCL_H */
85
86#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
87#define CONFIG_HEADER_DES_LOCL_H
88#ifndef DES_DEFAULT_OPTIONS
89/* the following is tweaked from a config script, that is why it is a
90 * protected undef/define */
91#ifndef DES_PTR
92#define DES_PTR
93#endif
94
95/* This helps C compiler generate the correct code for multiple functional
96 * units. It reduces register dependancies at the expense of 2 more
97 * registers */
98#ifndef DES_RISC1
99#define DES_RISC1
100#endif
101
102#ifndef DES_RISC2
103#undef DES_RISC2
104#endif
105
106#if defined(DES_RISC1) && defined(DES_RISC2)
107YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
108#endif
109
110/* Unroll the inner loop, this sometimes helps, sometimes hinders.
111 * Very mucy CPU dependant */
112#ifndef DES_UNROLL
113#define DES_UNROLL
114#endif
115
116/* These default values were supplied by
117 * Peter Gutman <pgut001@cs.auckland.ac.nz>
118 * They are only used if nothing else has been defined */
119#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
120/* Special defines which change the way the code is built depending on the
121 CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
122 even newer MIPS CPU's, but at the moment one size fits all for
123 optimization options. Older Sparc's work better with only UNROLL, but
124 there's no way to tell at compile time what it is you're running on */
125
126#if defined( sun ) /* Newer Sparc's */
127# define DES_PTR
128# define DES_RISC1
129# define DES_UNROLL
130#elif defined( __ultrix ) /* Older MIPS */
131# define DES_PTR
132# define DES_RISC2
133# define DES_UNROLL
134#elif defined( __osf1__ ) /* Alpha */
135# define DES_PTR
136# define DES_RISC2
137#elif defined ( _AIX ) /* RS6000 */
138 /* Unknown */
139#elif defined( __hpux ) /* HP-PA */
140 /* Unknown */
141#elif defined( __aux ) /* 68K */
142 /* Unknown */
143#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
144# define DES_UNROLL
145#elif defined( __sgi ) /* Newer MIPS */
146# define DES_PTR
147# define DES_RISC2
148# define DES_UNROLL
149#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
150# define DES_PTR
151# define DES_RISC1
152# define DES_UNROLL
153#endif /* Systems-specific speed defines */
154#endif
155
156#endif /* DES_DEFAULT_OPTIONS */
157#endif /* HEADER_DES_LOCL_H */
diff --git a/src/lib/libcrypto/arch/m88k/opensslconf.h b/src/lib/libcrypto/arch/m88k/opensslconf.h
deleted file mode 100644
index e3795ce73a..0000000000
--- a/src/lib/libcrypto/arch/m88k/opensslconf.h
+++ /dev/null
@@ -1,157 +0,0 @@
1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */
3
4/* Generate 80386 code? */
5#undef I386_ONLY
6
7#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
8#define OPENSSLDIR "/etc/ssl"
9#endif
10
11#undef OPENSSL_UNISTD
12#define OPENSSL_UNISTD <unistd.h>
13
14#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
15
16#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
17#define IDEA_INT unsigned int
18#endif
19
20#if defined(HEADER_MD2_H) && !defined(MD2_INT)
21#define MD2_INT unsigned int
22#endif
23
24#if defined(HEADER_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK)
41/*
42 * This enables code handling data aligned at natural CPU word
43 * boundary. See crypto/rc4/rc4_enc.c for further details.
44 */
45#undef RC4_CHUNK
46#endif
47#endif
48
49#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H
59#define BN_LLONG
60
61/* Should we define BN_DIV2W here? */
62
63/* Only one for the following should be defined */
64/* The prime number generation stuff may not work when
65 * EIGHT_BIT but I don't care since I've only used this mode
66 * for debuging the bignum libraries */
67#undef SIXTY_FOUR_BIT_LONG
68#undef SIXTY_FOUR_BIT
69#define THIRTY_TWO_BIT
70#undef SIXTEEN_BIT
71#undef EIGHT_BIT
72#endif
73
74#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
75#define CONFIG_HEADER_RC4_LOCL_H
76/* if this is defined data[i] is used instead of *data, this is a %20
77 * speedup on x86 */
78#define RC4_INDEX
79#endif
80
81#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
82#define CONFIG_HEADER_BF_LOCL_H
83#undef BF_PTR
84#endif /* HEADER_BF_LOCL_H */
85
86#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
87#define CONFIG_HEADER_DES_LOCL_H
88#ifndef DES_DEFAULT_OPTIONS
89/* the following is tweaked from a config script, that is why it is a
90 * protected undef/define */
91#ifndef DES_PTR
92#undef DES_PTR
93#endif
94
95/* This helps C compiler generate the correct code for multiple functional
96 * units. It reduces register dependancies at the expense of 2 more
97 * registers */
98#ifndef DES_RISC1
99#undef DES_RISC1
100#endif
101
102#ifndef DES_RISC2
103#undef DES_RISC2
104#endif
105
106#if defined(DES_RISC1) && defined(DES_RISC2)
107YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
108#endif
109
110/* Unroll the inner loop, this sometimes helps, sometimes hinders.
111 * Very mucy CPU dependant */
112#ifndef DES_UNROLL
113#define DES_UNROLL
114#endif
115
116/* These default values were supplied by
117 * Peter Gutman <pgut001@cs.auckland.ac.nz>
118 * They are only used if nothing else has been defined */
119#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
120/* Special defines which change the way the code is built depending on the
121 CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
122 even newer MIPS CPU's, but at the moment one size fits all for
123 optimization options. Older Sparc's work better with only UNROLL, but
124 there's no way to tell at compile time what it is you're running on */
125
126#if defined( sun ) /* Newer Sparc's */
127# define DES_PTR
128# define DES_RISC1
129# define DES_UNROLL
130#elif defined( __ultrix ) /* Older MIPS */
131# define DES_PTR
132# define DES_RISC2
133# define DES_UNROLL
134#elif defined( __osf1__ ) /* Alpha */
135# define DES_PTR
136# define DES_RISC2
137#elif defined ( _AIX ) /* RS6000 */
138 /* Unknown */
139#elif defined( __hpux ) /* HP-PA */
140 /* Unknown */
141#elif defined( __aux ) /* 68K */
142 /* Unknown */
143#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
144# define DES_UNROLL
145#elif defined( __sgi ) /* Newer MIPS */
146# define DES_PTR
147# define DES_RISC2
148# define DES_UNROLL
149#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
150# define DES_PTR
151# define DES_RISC1
152# define DES_UNROLL
153#endif /* Systems-specific speed defines */
154#endif
155
156#endif /* DES_DEFAULT_OPTIONS */
157#endif /* HEADER_DES_LOCL_H */
diff --git a/src/lib/libcrypto/arch/mips64/Makefile.inc b/src/lib/libcrypto/arch/mips64/Makefile.inc
deleted file mode 100644
index b6fc8971e7..0000000000
--- a/src/lib/libcrypto/arch/mips64/Makefile.inc
+++ /dev/null
@@ -1,44 +0,0 @@
1# $OpenBSD: Makefile.inc,v 1.4 2014/12/07 15:45:44 miod Exp $
2
3# mips64-specific libcrypto build rules
4
5# aes
6SRCS+= aes_cbc.c
7CFLAGS+= -DAES_ASM
8SSLASM+= aes aes-mips aes-mips
9# bf
10SRCS+= bf_enc.c
11# bn
12.if ${MACHINE} == "sgi" # because of R4000 support
13SRCS+= bn_asm.c
14.else
15SSLASM+= bn mips bn-mips
16CFLAGS+= -DBN_DIV3W
17.endif
18SSLASM+= bn mips-mont mips-mont
19CFLAGS+= -DOPENSSL_BN_ASM_MONT
20# camellia
21SRCS+= camellia.c cmll_cbc.c cmll_misc.c
22# des
23SRCS+= des_enc.c fcrypt_b.c
24# rc4
25SRCS+= rc4_enc.c rc4_skey.c
26## rc5
27#SRCS+= rc5_enc.c
28# sha
29SSLASM+= sha sha1-mips sha1-mips
30CFLAGS+= -DSHA1_ASM
31SSLASM+= sha sha512-mips sha256-mips
32CFLAGS+= -DSHA256_ASM
33SSLASM+= sha sha512-mips sha512-mips
34CFLAGS+= -DSHA512_ASM
35# whrlpool
36SRCS+= wp_block.c
37
38.for dir src dst in ${SSLASM}
39SRCS+= ${dst}.S
40GENERATED+=${dst}.S
41${dst}.S: ${LCRYPTO_SRC}/${dir}/asm/${src}.pl
42 /usr/bin/env CC=${CC} /usr/bin/perl \
43 ${LCRYPTO_SRC}/${dir}/asm/${src}.pl 64 ${.TARGET} > ${.TARGET}
44.endfor
diff --git a/src/lib/libcrypto/arch/mips64/opensslconf.h b/src/lib/libcrypto/arch/mips64/opensslconf.h
deleted file mode 100644
index ef7a679d94..0000000000
--- a/src/lib/libcrypto/arch/mips64/opensslconf.h
+++ /dev/null
@@ -1,157 +0,0 @@
1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */
3
4/* Generate 80386 code? */
5#undef I386_ONLY
6
7#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
8#define OPENSSLDIR "/etc/ssl"
9#endif
10
11#undef OPENSSL_UNISTD
12#define OPENSSL_UNISTD <unistd.h>
13
14#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
15
16#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
17#define IDEA_INT unsigned int
18#endif
19
20#if defined(HEADER_MD2_H) && !defined(MD2_INT)
21#define MD2_INT unsigned int
22#endif
23
24#if defined(HEADER_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK)
41/*
42 * This enables code handling data aligned at natural CPU word
43 * boundary. See crypto/rc4/rc4_enc.c for further details.
44 */
45#define RC4_CHUNK unsigned long
46#endif
47#endif
48
49#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H
59#undef BN_LLONG
60
61/* Should we define BN_DIV2W here? */
62
63/* Only one for the following should be defined */
64/* The prime number generation stuff may not work when
65 * EIGHT_BIT but I don't care since I've only used this mode
66 * for debuging the bignum libraries */
67#define SIXTY_FOUR_BIT_LONG
68#undef SIXTY_FOUR_BIT
69#undef THIRTY_TWO_BIT
70#undef SIXTEEN_BIT
71#undef EIGHT_BIT
72#endif
73
74#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
75#define CONFIG_HEADER_RC4_LOCL_H
76/* if this is defined data[i] is used instead of *data, this is a %20
77 * speedup on x86 */
78#undef RC4_INDEX
79#endif
80
81#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
82#define CONFIG_HEADER_BF_LOCL_H
83#define BF_PTR
84#endif /* HEADER_BF_LOCL_H */
85
86#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
87#define CONFIG_HEADER_DES_LOCL_H
88#ifndef DES_DEFAULT_OPTIONS
89/* the following is tweaked from a config script, that is why it is a
90 * protected undef/define */
91#ifndef DES_PTR
92#define DES_PTR
93#endif
94
95/* This helps C compiler generate the correct code for multiple functional
96 * units. It reduces register dependancies at the expense of 2 more
97 * registers */
98#ifndef DES_RISC1
99#undef DES_RISC1
100#endif
101
102#ifndef DES_RISC2
103#define DES_RISC2
104#endif
105
106#if defined(DES_RISC1) && defined(DES_RISC2)
107YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
108#endif
109
110/* Unroll the inner loop, this sometimes helps, sometimes hinders.
111 * Very mucy CPU dependant */
112#ifndef DES_UNROLL
113#undef DES_UNROLL
114#endif
115
116/* These default values were supplied by
117 * Peter Gutman <pgut001@cs.auckland.ac.nz>
118 * They are only used if nothing else has been defined */
119#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
120/* Special defines which change the way the code is built depending on the
121 CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
122 even newer MIPS CPU's, but at the moment one size fits all for
123 optimization options. Older Sparc's work better with only UNROLL, but
124 there's no way to tell at compile time what it is you're running on */
125
126#if defined( sun ) /* Newer Sparc's */
127# define DES_PTR
128# define DES_RISC1
129# define DES_UNROLL
130#elif defined( __ultrix ) /* Older MIPS */
131# define DES_PTR
132# define DES_RISC2
133# define DES_UNROLL
134#elif defined( __osf1__ ) /* Alpha */
135# define DES_PTR
136# define DES_RISC2
137#elif defined ( _AIX ) /* RS6000 */
138 /* Unknown */
139#elif defined( __hpux ) /* HP-PA */
140 /* Unknown */
141#elif defined( __aux ) /* 68K */
142 /* Unknown */
143#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
144# define DES_UNROLL
145#elif defined( __sgi ) /* Newer MIPS */
146# define DES_PTR
147# define DES_RISC2
148# define DES_UNROLL
149#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
150# define DES_PTR
151# define DES_RISC1
152# define DES_UNROLL
153#endif /* Systems-specific speed defines */
154#endif
155
156#endif /* DES_DEFAULT_OPTIONS */
157#endif /* HEADER_DES_LOCL_H */
diff --git a/src/lib/libcrypto/arch/powerpc/Makefile.inc b/src/lib/libcrypto/arch/powerpc/Makefile.inc
deleted file mode 100644
index 46790859b5..0000000000
--- a/src/lib/libcrypto/arch/powerpc/Makefile.inc
+++ /dev/null
@@ -1,46 +0,0 @@
1# $OpenBSD: Makefile.inc,v 1.2 2014/11/17 20:31:22 miod Exp $
2
3# powerpc-specific libcrypto build rules
4
5# aes
6SRCS+= aes_core.c aes_cbc.c
7# slower than C code
8#CFLAGS+= -DAES_ASM
9#SSLASM+= aes aes-ppc aes-ppc
10# bf
11SRCS+= bf_enc.c
12# bn
13SSLASM+= bn ppc bn-ppc
14SSLASM+= bn ppc-mont ppc-mont # bn_mul_mont_int
15#SSLASM+= bn ppc64-mont ppc64-mont # bn_mul_mont_fpu64
16CFLAGS+= -DOPENSSL_BN_ASM_MONT
17# camellia
18SRCS+= camellia.c cmll_cbc.c cmll_misc.c
19# des
20SRCS+= des_enc.c fcrypt_b.c
21# rc4
22SRCS+= rc4_enc.c rc4_skey.c
23## rc5
24#SRCS+= rc5_enc.c
25# sha
26CFLAGS+= -DSHA1_ASM
27SSLASM+= sha sha1-ppc sha1-ppc
28CFLAGS+= -DSHA256_ASM
29SSLASM+= sha sha512-ppc sha256-ppc
30# whrlpool
31SRCS+= wp_block.c
32
33.for dir src dst in ${SSLASM}
34SRCS+= ${dst}.S
35GENERATED+=${dst}.S
36${dst}.S: ${LCRYPTO_SRC}/${dir}/asm/${src}.pl
37 /usr/bin/perl \
38 ${LCRYPTO_SRC}/${dir}/asm/${src}.pl linux32 ${.TARGET} > ${.TARGET}
39.endfor
40
41#CFLAGS+= -DOPENSSL_CPUID_OBJ # it's commented out in ppccap.c
42SRCS+= ppccpuid.S ppccap.c
43GENERATED+=ppccpuid.S
44ppccpuid.S: ${LCRYPTO_SRC}/ppccpuid.pl
45 /usr/bin/perl \
46 ${LCRYPTO_SRC}/ppccpuid.pl linux32 > ${.TARGET}
diff --git a/src/lib/libcrypto/arch/powerpc/opensslconf.h b/src/lib/libcrypto/arch/powerpc/opensslconf.h
deleted file mode 100644
index e3795ce73a..0000000000
--- a/src/lib/libcrypto/arch/powerpc/opensslconf.h
+++ /dev/null
@@ -1,157 +0,0 @@
1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */
3
4/* Generate 80386 code? */
5#undef I386_ONLY
6
7#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
8#define OPENSSLDIR "/etc/ssl"
9#endif
10
11#undef OPENSSL_UNISTD
12#define OPENSSL_UNISTD <unistd.h>
13
14#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
15
16#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
17#define IDEA_INT unsigned int
18#endif
19
20#if defined(HEADER_MD2_H) && !defined(MD2_INT)
21#define MD2_INT unsigned int
22#endif
23
24#if defined(HEADER_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK)
41/*
42 * This enables code handling data aligned at natural CPU word
43 * boundary. See crypto/rc4/rc4_enc.c for further details.
44 */
45#undef RC4_CHUNK
46#endif
47#endif
48
49#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H
59#define BN_LLONG
60
61/* Should we define BN_DIV2W here? */
62
63/* Only one for the following should be defined */
64/* The prime number generation stuff may not work when
65 * EIGHT_BIT but I don't care since I've only used this mode
66 * for debuging the bignum libraries */
67#undef SIXTY_FOUR_BIT_LONG
68#undef SIXTY_FOUR_BIT
69#define THIRTY_TWO_BIT
70#undef SIXTEEN_BIT
71#undef EIGHT_BIT
72#endif
73
74#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
75#define CONFIG_HEADER_RC4_LOCL_H
76/* if this is defined data[i] is used instead of *data, this is a %20
77 * speedup on x86 */
78#define RC4_INDEX
79#endif
80
81#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
82#define CONFIG_HEADER_BF_LOCL_H
83#undef BF_PTR
84#endif /* HEADER_BF_LOCL_H */
85
86#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
87#define CONFIG_HEADER_DES_LOCL_H
88#ifndef DES_DEFAULT_OPTIONS
89/* the following is tweaked from a config script, that is why it is a
90 * protected undef/define */
91#ifndef DES_PTR
92#undef DES_PTR
93#endif
94
95/* This helps C compiler generate the correct code for multiple functional
96 * units. It reduces register dependancies at the expense of 2 more
97 * registers */
98#ifndef DES_RISC1
99#undef DES_RISC1
100#endif
101
102#ifndef DES_RISC2
103#undef DES_RISC2
104#endif
105
106#if defined(DES_RISC1) && defined(DES_RISC2)
107YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
108#endif
109
110/* Unroll the inner loop, this sometimes helps, sometimes hinders.
111 * Very mucy CPU dependant */
112#ifndef DES_UNROLL
113#define DES_UNROLL
114#endif
115
116/* These default values were supplied by
117 * Peter Gutman <pgut001@cs.auckland.ac.nz>
118 * They are only used if nothing else has been defined */
119#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
120/* Special defines which change the way the code is built depending on the
121 CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
122 even newer MIPS CPU's, but at the moment one size fits all for
123 optimization options. Older Sparc's work better with only UNROLL, but
124 there's no way to tell at compile time what it is you're running on */
125
126#if defined( sun ) /* Newer Sparc's */
127# define DES_PTR
128# define DES_RISC1
129# define DES_UNROLL
130#elif defined( __ultrix ) /* Older MIPS */
131# define DES_PTR
132# define DES_RISC2
133# define DES_UNROLL
134#elif defined( __osf1__ ) /* Alpha */
135# define DES_PTR
136# define DES_RISC2
137#elif defined ( _AIX ) /* RS6000 */
138 /* Unknown */
139#elif defined( __hpux ) /* HP-PA */
140 /* Unknown */
141#elif defined( __aux ) /* 68K */
142 /* Unknown */
143#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
144# define DES_UNROLL
145#elif defined( __sgi ) /* Newer MIPS */
146# define DES_PTR
147# define DES_RISC2
148# define DES_UNROLL
149#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
150# define DES_PTR
151# define DES_RISC1
152# define DES_UNROLL
153#endif /* Systems-specific speed defines */
154#endif
155
156#endif /* DES_DEFAULT_OPTIONS */
157#endif /* HEADER_DES_LOCL_H */
diff --git a/src/lib/libcrypto/arch/sh/opensslconf.h b/src/lib/libcrypto/arch/sh/opensslconf.h
deleted file mode 100644
index e3795ce73a..0000000000
--- a/src/lib/libcrypto/arch/sh/opensslconf.h
+++ /dev/null
@@ -1,157 +0,0 @@
1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */
3
4/* Generate 80386 code? */
5#undef I386_ONLY
6
7#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
8#define OPENSSLDIR "/etc/ssl"
9#endif
10
11#undef OPENSSL_UNISTD
12#define OPENSSL_UNISTD <unistd.h>
13
14#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
15
16#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
17#define IDEA_INT unsigned int
18#endif
19
20#if defined(HEADER_MD2_H) && !defined(MD2_INT)
21#define MD2_INT unsigned int
22#endif
23
24#if defined(HEADER_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK)
41/*
42 * This enables code handling data aligned at natural CPU word
43 * boundary. See crypto/rc4/rc4_enc.c for further details.
44 */
45#undef RC4_CHUNK
46#endif
47#endif
48
49#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H
59#define BN_LLONG
60
61/* Should we define BN_DIV2W here? */
62
63/* Only one for the following should be defined */
64/* The prime number generation stuff may not work when
65 * EIGHT_BIT but I don't care since I've only used this mode
66 * for debuging the bignum libraries */
67#undef SIXTY_FOUR_BIT_LONG
68#undef SIXTY_FOUR_BIT
69#define THIRTY_TWO_BIT
70#undef SIXTEEN_BIT
71#undef EIGHT_BIT
72#endif
73
74#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
75#define CONFIG_HEADER_RC4_LOCL_H
76/* if this is defined data[i] is used instead of *data, this is a %20
77 * speedup on x86 */
78#define RC4_INDEX
79#endif
80
81#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
82#define CONFIG_HEADER_BF_LOCL_H
83#undef BF_PTR
84#endif /* HEADER_BF_LOCL_H */
85
86#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
87#define CONFIG_HEADER_DES_LOCL_H
88#ifndef DES_DEFAULT_OPTIONS
89/* the following is tweaked from a config script, that is why it is a
90 * protected undef/define */
91#ifndef DES_PTR
92#undef DES_PTR
93#endif
94
95/* This helps C compiler generate the correct code for multiple functional
96 * units. It reduces register dependancies at the expense of 2 more
97 * registers */
98#ifndef DES_RISC1
99#undef DES_RISC1
100#endif
101
102#ifndef DES_RISC2
103#undef DES_RISC2
104#endif
105
106#if defined(DES_RISC1) && defined(DES_RISC2)
107YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
108#endif
109
110/* Unroll the inner loop, this sometimes helps, sometimes hinders.
111 * Very mucy CPU dependant */
112#ifndef DES_UNROLL
113#define DES_UNROLL
114#endif
115
116/* These default values were supplied by
117 * Peter Gutman <pgut001@cs.auckland.ac.nz>
118 * They are only used if nothing else has been defined */
119#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
120/* Special defines which change the way the code is built depending on the
121 CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
122 even newer MIPS CPU's, but at the moment one size fits all for
123 optimization options. Older Sparc's work better with only UNROLL, but
124 there's no way to tell at compile time what it is you're running on */
125
126#if defined( sun ) /* Newer Sparc's */
127# define DES_PTR
128# define DES_RISC1
129# define DES_UNROLL
130#elif defined( __ultrix ) /* Older MIPS */
131# define DES_PTR
132# define DES_RISC2
133# define DES_UNROLL
134#elif defined( __osf1__ ) /* Alpha */
135# define DES_PTR
136# define DES_RISC2
137#elif defined ( _AIX ) /* RS6000 */
138 /* Unknown */
139#elif defined( __hpux ) /* HP-PA */
140 /* Unknown */
141#elif defined( __aux ) /* 68K */
142 /* Unknown */
143#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
144# define DES_UNROLL
145#elif defined( __sgi ) /* Newer MIPS */
146# define DES_PTR
147# define DES_RISC2
148# define DES_UNROLL
149#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
150# define DES_PTR
151# define DES_RISC1
152# define DES_UNROLL
153#endif /* Systems-specific speed defines */
154#endif
155
156#endif /* DES_DEFAULT_OPTIONS */
157#endif /* HEADER_DES_LOCL_H */
diff --git a/src/lib/libcrypto/arch/sparc/Makefile.inc b/src/lib/libcrypto/arch/sparc/Makefile.inc
deleted file mode 100644
index ba9954c85e..0000000000
--- a/src/lib/libcrypto/arch/sparc/Makefile.inc
+++ /dev/null
@@ -1,29 +0,0 @@
1# $OpenBSD: Makefile.inc,v 1.2 2014/11/17 20:31:22 miod Exp $
2
3# sparc-specific libcrypto build rules
4
5# aes
6SRCS+= aes_core.c aes_cbc.c
7# bf
8SRCS+= bf_enc.c
9# bn
10.if 0 # uses `umul' and `udiv' instructions
11SRCS+= sparcv8.S
12.PATH: ${LCRYPTO_SRC}/bn/asm
13.else
14SRCS+= bn_asm.c
15.endif
16# camellia
17SRCS+= camellia.c cmll_cbc.c cmll_misc.c
18# des
19SRCS+= fcrypt_b.c
20SRCS+= des_enc-sparc.S
21GENERATED+= des_enc-sparc.S
22des_enc-sparc.S: ${LCRYPTO_SRC}/des/asm/des_enc.m4
23 m4 ${LCRYPTO_SRC}/des/asm/des_enc.m4 > ${.TARGET}
24# rc4
25SRCS+= rc4_enc.c rc4_skey.c
26## rc5
27#SRCS+= rc5_enc.c
28# whrlpool
29SRCS+= wp_block.c
diff --git a/src/lib/libcrypto/arch/sparc/opensslconf.h b/src/lib/libcrypto/arch/sparc/opensslconf.h
deleted file mode 100644
index e3795ce73a..0000000000
--- a/src/lib/libcrypto/arch/sparc/opensslconf.h
+++ /dev/null
@@ -1,157 +0,0 @@
1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */
3
4/* Generate 80386 code? */
5#undef I386_ONLY
6
7#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
8#define OPENSSLDIR "/etc/ssl"
9#endif
10
11#undef OPENSSL_UNISTD
12#define OPENSSL_UNISTD <unistd.h>
13
14#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
15
16#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
17#define IDEA_INT unsigned int
18#endif
19
20#if defined(HEADER_MD2_H) && !defined(MD2_INT)
21#define MD2_INT unsigned int
22#endif
23
24#if defined(HEADER_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK)
41/*
42 * This enables code handling data aligned at natural CPU word
43 * boundary. See crypto/rc4/rc4_enc.c for further details.
44 */
45#undef RC4_CHUNK
46#endif
47#endif
48
49#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H
59#define BN_LLONG
60
61/* Should we define BN_DIV2W here? */
62
63/* Only one for the following should be defined */
64/* The prime number generation stuff may not work when
65 * EIGHT_BIT but I don't care since I've only used this mode
66 * for debuging the bignum libraries */
67#undef SIXTY_FOUR_BIT_LONG
68#undef SIXTY_FOUR_BIT
69#define THIRTY_TWO_BIT
70#undef SIXTEEN_BIT
71#undef EIGHT_BIT
72#endif
73
74#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
75#define CONFIG_HEADER_RC4_LOCL_H
76/* if this is defined data[i] is used instead of *data, this is a %20
77 * speedup on x86 */
78#define RC4_INDEX
79#endif
80
81#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
82#define CONFIG_HEADER_BF_LOCL_H
83#undef BF_PTR
84#endif /* HEADER_BF_LOCL_H */
85
86#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
87#define CONFIG_HEADER_DES_LOCL_H
88#ifndef DES_DEFAULT_OPTIONS
89/* the following is tweaked from a config script, that is why it is a
90 * protected undef/define */
91#ifndef DES_PTR
92#undef DES_PTR
93#endif
94
95/* This helps C compiler generate the correct code for multiple functional
96 * units. It reduces register dependancies at the expense of 2 more
97 * registers */
98#ifndef DES_RISC1
99#undef DES_RISC1
100#endif
101
102#ifndef DES_RISC2
103#undef DES_RISC2
104#endif
105
106#if defined(DES_RISC1) && defined(DES_RISC2)
107YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
108#endif
109
110/* Unroll the inner loop, this sometimes helps, sometimes hinders.
111 * Very mucy CPU dependant */
112#ifndef DES_UNROLL
113#define DES_UNROLL
114#endif
115
116/* These default values were supplied by
117 * Peter Gutman <pgut001@cs.auckland.ac.nz>
118 * They are only used if nothing else has been defined */
119#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
120/* Special defines which change the way the code is built depending on the
121 CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
122 even newer MIPS CPU's, but at the moment one size fits all for
123 optimization options. Older Sparc's work better with only UNROLL, but
124 there's no way to tell at compile time what it is you're running on */
125
126#if defined( sun ) /* Newer Sparc's */
127# define DES_PTR
128# define DES_RISC1
129# define DES_UNROLL
130#elif defined( __ultrix ) /* Older MIPS */
131# define DES_PTR
132# define DES_RISC2
133# define DES_UNROLL
134#elif defined( __osf1__ ) /* Alpha */
135# define DES_PTR
136# define DES_RISC2
137#elif defined ( _AIX ) /* RS6000 */
138 /* Unknown */
139#elif defined( __hpux ) /* HP-PA */
140 /* Unknown */
141#elif defined( __aux ) /* 68K */
142 /* Unknown */
143#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
144# define DES_UNROLL
145#elif defined( __sgi ) /* Newer MIPS */
146# define DES_PTR
147# define DES_RISC2
148# define DES_UNROLL
149#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
150# define DES_PTR
151# define DES_RISC1
152# define DES_UNROLL
153#endif /* Systems-specific speed defines */
154#endif
155
156#endif /* DES_DEFAULT_OPTIONS */
157#endif /* HEADER_DES_LOCL_H */
diff --git a/src/lib/libcrypto/arch/sparc64/Makefile.inc b/src/lib/libcrypto/arch/sparc64/Makefile.inc
deleted file mode 100644
index e3f217dbb8..0000000000
--- a/src/lib/libcrypto/arch/sparc64/Makefile.inc
+++ /dev/null
@@ -1,48 +0,0 @@
1# $OpenBSD: Makefile.inc,v 1.2 2014/11/17 20:31:22 miod Exp $
2
3# sparc64-specific libcrypto build rules
4
5# aes
6SRCS+= aes_core.c aes_cbc.c
7CFLAGS+= -DAES_ASM
8SSLASM+= aes aes-sparcv9 aes-sparcv9
9# bf
10SRCS+= bf_enc.c
11# bn
12SRCS+= bn_asm.c
13# camellia
14SRCS+= camellia.c cmll_cbc.c cmll_misc.c
15# des
16SRCS+= fcrypt_b.c
17SRCS+= des_enc-sparc.S
18GENERATED+= des_enc-sparc.S
19des_enc-sparc.S: ${LCRYPTO_SRC}/des/asm/des_enc.m4
20 m4 ${LCRYPTO_SRC}/des/asm/des_enc.m4 > ${.TARGET}
21# modes
22CFLAGS+= -DGHASH_ASM
23SSLASM+= modes ghash-sparcv9 ghash-sparcv9
24# rc4
25SRCS+= rc4_enc.c rc4_skey.c
26## rc5
27#SRCS+= rc5_enc.c
28# sha
29SSLASM+= sha sha1-sparcv9 sha1-sparcv9
30CFLAGS+= -DSHA1_ASM
31SSLASM+= sha sha512-sparcv9 sha256-sparcv9
32CFLAGS+= -DSHA256_ASM
33SSLASM+= sha sha512-sparcv9 sha512-sparcv9
34CFLAGS+= -DSHA512_ASM
35# whrlpool
36SRCS+= wp_block.c
37
38.for dir src dst in ${SSLASM}
39SRCS+= ${dst}.S
40GENERATED+=${dst}.S
41${dst}.S: ${LCRYPTO_SRC}/${dir}/asm/${src}.pl
42 /usr/bin/env CC=${CC} /usr/bin/perl \
43 ${LCRYPTO_SRC}/${dir}/asm/${src}.pl ${.TARGET} -m64 > ${.TARGET}
44.endfor
45
46# not until Montgomery code enabled
47#CFLAGS+= -DOPENSSL_CPUID_OBJ
48#SRCS+= sparccpuid.S sparcv9cap.c
diff --git a/src/lib/libcrypto/arch/sparc64/opensslconf.h b/src/lib/libcrypto/arch/sparc64/opensslconf.h
deleted file mode 100644
index ef7a679d94..0000000000
--- a/src/lib/libcrypto/arch/sparc64/opensslconf.h
+++ /dev/null
@@ -1,157 +0,0 @@
1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */
3
4/* Generate 80386 code? */
5#undef I386_ONLY
6
7#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
8#define OPENSSLDIR "/etc/ssl"
9#endif
10
11#undef OPENSSL_UNISTD
12#define OPENSSL_UNISTD <unistd.h>
13
14#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
15
16#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
17#define IDEA_INT unsigned int
18#endif
19
20#if defined(HEADER_MD2_H) && !defined(MD2_INT)
21#define MD2_INT unsigned int
22#endif
23
24#if defined(HEADER_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK)
41/*
42 * This enables code handling data aligned at natural CPU word
43 * boundary. See crypto/rc4/rc4_enc.c for further details.
44 */
45#define RC4_CHUNK unsigned long
46#endif
47#endif
48
49#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H
59#undef BN_LLONG
60
61/* Should we define BN_DIV2W here? */
62
63/* Only one for the following should be defined */
64/* The prime number generation stuff may not work when
65 * EIGHT_BIT but I don't care since I've only used this mode
66 * for debuging the bignum libraries */
67#define SIXTY_FOUR_BIT_LONG
68#undef SIXTY_FOUR_BIT
69#undef THIRTY_TWO_BIT
70#undef SIXTEEN_BIT
71#undef EIGHT_BIT
72#endif
73
74#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
75#define CONFIG_HEADER_RC4_LOCL_H
76/* if this is defined data[i] is used instead of *data, this is a %20
77 * speedup on x86 */
78#undef RC4_INDEX
79#endif
80
81#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
82#define CONFIG_HEADER_BF_LOCL_H
83#define BF_PTR
84#endif /* HEADER_BF_LOCL_H */
85
86#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
87#define CONFIG_HEADER_DES_LOCL_H
88#ifndef DES_DEFAULT_OPTIONS
89/* the following is tweaked from a config script, that is why it is a
90 * protected undef/define */
91#ifndef DES_PTR
92#define DES_PTR
93#endif
94
95/* This helps C compiler generate the correct code for multiple functional
96 * units. It reduces register dependancies at the expense of 2 more
97 * registers */
98#ifndef DES_RISC1
99#undef DES_RISC1
100#endif
101
102#ifndef DES_RISC2
103#define DES_RISC2
104#endif
105
106#if defined(DES_RISC1) && defined(DES_RISC2)
107YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
108#endif
109
110/* Unroll the inner loop, this sometimes helps, sometimes hinders.
111 * Very mucy CPU dependant */
112#ifndef DES_UNROLL
113#undef DES_UNROLL
114#endif
115
116/* These default values were supplied by
117 * Peter Gutman <pgut001@cs.auckland.ac.nz>
118 * They are only used if nothing else has been defined */
119#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
120/* Special defines which change the way the code is built depending on the
121 CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
122 even newer MIPS CPU's, but at the moment one size fits all for
123 optimization options. Older Sparc's work better with only UNROLL, but
124 there's no way to tell at compile time what it is you're running on */
125
126#if defined( sun ) /* Newer Sparc's */
127# define DES_PTR
128# define DES_RISC1
129# define DES_UNROLL
130#elif defined( __ultrix ) /* Older MIPS */
131# define DES_PTR
132# define DES_RISC2
133# define DES_UNROLL
134#elif defined( __osf1__ ) /* Alpha */
135# define DES_PTR
136# define DES_RISC2
137#elif defined ( _AIX ) /* RS6000 */
138 /* Unknown */
139#elif defined( __hpux ) /* HP-PA */
140 /* Unknown */
141#elif defined( __aux ) /* 68K */
142 /* Unknown */
143#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
144# define DES_UNROLL
145#elif defined( __sgi ) /* Newer MIPS */
146# define DES_PTR
147# define DES_RISC2
148# define DES_UNROLL
149#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
150# define DES_PTR
151# define DES_RISC1
152# define DES_UNROLL
153#endif /* Systems-specific speed defines */
154#endif
155
156#endif /* DES_DEFAULT_OPTIONS */
157#endif /* HEADER_DES_LOCL_H */
diff --git a/src/lib/libcrypto/arch/vax/Makefile.inc b/src/lib/libcrypto/arch/vax/Makefile.inc
deleted file mode 100644
index f7764cf44a..0000000000
--- a/src/lib/libcrypto/arch/vax/Makefile.inc
+++ /dev/null
@@ -1,21 +0,0 @@
1# $OpenBSD: Makefile.inc,v 1.2 2014/11/17 20:31:22 miod Exp $
2
3# vax-specific libcrypto build rules
4
5# aes
6CFLAGS+=-DOPENSSL_NO_ASM
7SRCS+= aes_core.c aes_cbc.c
8# bf
9SRCS+= bf_enc.c
10# bn
11SRCS+= bn_asm_vax.S
12# camellia
13SRCS+= camellia.c cmll_cbc.c cmll_misc.c
14# des
15SRCS+= des_enc.c fcrypt_b.c
16# rc4
17SRCS+= rc4_enc.c rc4_skey.c
18## rc5
19#SRCS+= rc5_enc.c
20# whrlpool
21SRCS+= wp_block.c
diff --git a/src/lib/libcrypto/arch/vax/bn_asm_vax.S b/src/lib/libcrypto/arch/vax/bn_asm_vax.S
deleted file mode 100644
index 2969ae9dac..0000000000
--- a/src/lib/libcrypto/arch/vax/bn_asm_vax.S
+++ /dev/null
@@ -1,436 +0,0 @@
1# $OpenBSD: bn_asm_vax.S,v 1.1 2014/04/11 22:51:53 miod Exp $
2# $NetBSD: bn_asm_vax.S,v 1.1 2003/11/03 10:22:28 ragge Exp $
3
4#include <machine/asm.h>
5
6# w.j.m. 15-jan-1999
7#
8# it's magic ...
9#
10# ULONG bn_mul_add_words(ULONG r[],ULONG a[],int n,ULONG w) {
11# ULONG c = 0;
12# int i;
13# for(i = 0; i < n; i++) <c,r[i]> := r[i] + c + a[i] * w ;
14# return c;
15# }
16
17ENTRY(bn_mul_add_words,R6)
18 movl 4(%ap),%r2 # *r
19 movl 8(%ap),%r3 # *a
20 movl 12(%ap),%r4 # n
21 movl 16(%ap),%r5 # w
22 clrl %r6 # return value ("carry")
23
240: emul %r5,(%r3),(%r2),%r0 # w * a[0] + r[0] -> r0
25
26 # fixup for "negative" r[]
27 tstl (%r2)
28 bgeq 1f
29 incl %r1 # add 1 to highword
30
311: # add saved carry to result
32 addl2 %r6,%r0
33 adwc $0,%r1
34
35 # combined fixup for "negative" w, a[]
36 tstl %r5 # if w is negative...
37 bgeq 1f
38 addl2 (%r3),%r1 # ...add a[0] again to highword
391: tstl (%r3) # if a[0] is negative...
40 bgeq 1f
41 addl2 %r5,%r1 # ...add w again to highword
421:
43 movl %r0,(%r2)+ # save low word in dest & advance *r
44 addl2 $4,%r3 # advance *a
45 movl %r1,%r6 # high word in r6 for return value
46
47 sobgtr %r4,0b # loop?
48
49 movl %r6,%r0
50 ret
51
52# .title vax_bn_mul_words unsigned multiply & add, 32*32+32=>64
53#;
54#; w.j.m. 15-jan-1999
55#;
56#; it's magic ...
57#;
58#; ULONG bn_mul_words(ULONG r[],ULONG a[],int n,ULONG w) {
59#; ULONG c = 0;
60#; int i;
61#; for(i = 0; i < num; i++) <c,r[i]> := a[i] * w + c ;
62#; return(c);
63#; }
64#
65
66ENTRY(bn_mul_words,R6)
67 movl 4(%ap),%r2 # *r
68 movl 8(%ap),%r3 # *a
69 movl 12(%ap),%r4 # n
70 movl 16(%ap),%r5 # w
71 clrl %r6 # carry
72
730: emul %r5,(%r3),%r6,%r0 # w * a[0] + carry -> r0
74
75 # fixup for "negative" carry
76 tstl %r6
77 bgeq 1f
78 incl %r1
79
801: # combined fixup for "negative" w, a[]
81 tstl %r5
82 bgeq 1f
83 addl2 (%r3),%r1
841: tstl (%r3)
85 bgeq 1f
86 addl2 %r5,%r1
87
881: movl %r0,(%r2)+
89 addl2 $4,%r3
90 movl %r1,%r6
91
92 sobgtr %r4,0b
93
94 movl %r6,%r0
95 ret
96
97
98
99# .title vax_bn_sqr_words unsigned square, 32*32=>64
100#;
101#; w.j.m. 15-jan-1999
102#;
103#; it's magic ...
104#;
105#; void bn_sqr_words(ULONG r[],ULONG a[],int n) {
106#; int i;
107#; for(i = 0; i < n; i++) <r[2*i+1],r[2*i]> := a[i] * a[i] ;
108#; }
109#
110
111ENTRY(bn_sqr_words,0)
112 movl 4(%ap),%r2 # r
113 movl 8(%ap),%r3 # a
114 movl 12(%ap),%r4 # n
115
1160: movl (%r3)+,%r5 # r5 = a[] & advance
117
118 emul %r5,%r5,$0,%r0 # a[0] * a[0] + 0 -> r0
119
120 # fixup for "negative" a[]
121 tstl %r5
122 bgeq 1f
123 addl2 %r5,%r1
124 addl2 %r5,%r1
125
1261: movq %r0,(%r2)+ # store 64-bit result
127
128 sobgtr %r4,0b # loop
129
130 ret
131
132
133# .title vax_bn_div_words unsigned divide
134#;
135#; Richard Levitte 20-Nov-2000
136#;
137#; ULONG bn_div_words(ULONG h, ULONG l, ULONG d)
138#; {
139#; return ((ULONG)((((ULLONG)h)<<32)|l) / (ULLONG)d);
140#; }
141#;
142#; Using EDIV would be very easy, if it didn't do signed calculations.
143#; Any time any of the input numbers are signed, there are problems,
144#; usually with integer overflow, at which point it returns useless
145#; data (the quotient gets the value of l, and the remainder becomes 0).
146#;
147#; If it was just for the dividend, it would be very easy, just divide
148#; it by 2 (unsigned), do the division, multiply the resulting quotient
149#; and remainder by 2, add the bit that was dropped when dividing by 2
150#; to the remainder, and do some adjustment so the remainder doesn't
151#; end up larger than the divisor. For some cases when the divisor is
152#; negative (from EDIV's point of view, i.e. when the highest bit is set),
153#; dividing the dividend by 2 isn't enough, and since some operations
154#; might generate integer overflows even when the dividend is divided by
155#; 4 (when the high part of the shifted down dividend ends up being exactly
156#; half of the divisor, the result is the quotient 0x80000000, which is
157#; negative...) it needs to be divided by 8. Furthermore, the divisor needs
158#; to be divided by 2 (unsigned) as well, to avoid more problems with the sign.
159#; In this case, a little extra fiddling with the remainder is required.
160#;
161#; So, the simplest way to handle this is always to divide the dividend
162#; by 8, and to divide the divisor by 2 if it's highest bit is set.
163#; After EDIV has been used, the quotient gets multiplied by 8 if the
164#; original divisor was positive, otherwise 4. The remainder, oddly
165#; enough, is *always* multiplied by 8.
166#; NOTE: in the case mentioned above, where the high part of the shifted
167#; down dividend ends up being exactly half the shifted down divisor, we
168#; end up with a 33 bit quotient. That's no problem however, it usually
169#; means we have ended up with a too large remainder as well, and the
170#; problem is fixed by the last part of the algorithm (next paragraph).
171#;
172#; The routine ends with comparing the resulting remainder with the
173#; original divisor and if the remainder is larger, subtract the
174#; original divisor from it, and increase the quotient by 1. This is
175#; done until the remainder is smaller than the divisor.
176#;
177#; The complete algorithm looks like this:
178#;
179#; d' = d
180#; l' = l & 7
181#; [h,l] = [h,l] >> 3
182#; [q,r] = floor([h,l] / d) # This is the EDIV operation
183#; if (q < 0) q = -q # I doubt this is necessary any more
184#;
185#; r' = r >> 29
186#; if (d' >= 0)
187#; q' = q >> 29
188#; q = q << 3
189#; else
190#; q' = q >> 30
191#; q = q << 2
192#; r = (r << 3) + l'
193#;
194#; if (d' < 0)
195#; {
196#; [r',r] = [r',r] - q
197#; while ([r',r] < 0)
198#; {
199#; [r',r] = [r',r] + d
200#; [q',q] = [q',q] - 1
201#; }
202#; }
203#;
204#; while ([r',r] >= d')
205#; {
206#; [r',r] = [r',r] - d'
207#; [q',q] = [q',q] + 1
208#; }
209#;
210#; return q
211#
212#;r2 = l, q
213#;r3 = h, r
214#;r4 = d
215#;r5 = l'
216#;r6 = r'
217#;r7 = d'
218#;r8 = q'
219#
220
221ENTRY(bn_div_words,R6|R7|R8)
222 movl 4(%ap),%r3 # h
223 movl 8(%ap),%r2 # l
224 movl 12(%ap),%r4 # d
225
226 bicl3 $-8,%r2,%r5 # l' = l & 7
227 bicl3 $7,%r2,%r2
228
229 bicl3 $-8,%r3,%r6
230 bicl3 $7,%r3,%r3
231
232 addl2 %r6,%r2
233
234 rotl $-3,%r2,%r2 # l = l >> 3
235 rotl $-3,%r3,%r3 # h = h >> 3
236
237 movl %r4,%r7 # d' = d
238
239 clrl %r6 # r' = 0
240 clrl %r8 # q' = 0
241
242 tstl %r4
243 beql 0f # Uh-oh, the divisor is 0...
244 bgtr 1f
245 rotl $-1,%r4,%r4 # If d is negative, shift it right.
246 bicl2 $0x80000000,%r4 # Since d is then a large number, the
247 # lowest bit is insignificant
248 # (contradict that, and I'll fix the problem!)
2491:
250 ediv %r4,%r2,%r2,%r3 # Do the actual division
251
252 tstl %r2
253 bgeq 1f
254 mnegl %r2,%r2 # if q < 0, negate it
2551:
256 tstl %r7
257 blss 1f
258 rotl $3,%r2,%r2 # q = q << 3
259 bicl3 $-8,%r2,%r8 # q' gets the high bits from q
260 bicl3 $7,%r2,%r2
261 brb 2f
262
2631: # else
264 rotl $2,%r2,%r2 # q = q << 2
265 bicl3 $-4,%r2,%r8 # q' gets the high bits from q
266 bicl3 $3,%r2,%r2
2672:
268 rotl $3,%r3,%r3 # r = r << 3
269 bicl3 $-8,%r3,%r6 # r' gets the high bits from r
270 bicl3 $7,%r3,%r3
271 addl2 %r5,%r3 # r = r + l'
272
273 tstl %r7
274 bgeq 5f
275 bitl $1,%r7
276 beql 5f # if d' < 0 && d' & 1
277 subl2 %r2,%r3 # [r',r] = [r',r] - [q',q]
278 sbwc %r8,%r6
2793:
280 bgeq 5f # while r < 0
281 decl %r2 # [q',q] = [q',q] - 1
282 sbwc $0,%r8
283 addl2 %r7,%r3 # [r',r] = [r',r] + d'
284 adwc $0,%r6
285 brb 3b
286
287# The return points are placed in the middle to keep a short distance from
288# all the branch points
2891:
290# movl %r3,%r1
291 movl %r2,%r0
292 ret
2930:
294 movl $-1,%r0
295 ret
2965:
297 tstl %r6
298 bneq 6f
299 cmpl %r3,%r7
300 blssu 1b # while [r',r] >= d'
3016:
302 subl2 %r7,%r3 # [r',r] = [r',r] - d'
303 sbwc $0,%r6
304 incl %r2 # [q',q] = [q',q] + 1
305 adwc $0,%r8
306 brb 5b
307
308
309
310# .title vax_bn_add_words unsigned add of two arrays
311#;
312#; Richard Levitte 20-Nov-2000
313#;
314#; ULONG bn_add_words(ULONG r[], ULONG a[], ULONG b[], int n) {
315#; ULONG c = 0;
316#; int i;
317#; for (i = 0; i < n; i++) <c,r[i]> = a[i] + b[i] + c;
318#; return(c);
319#; }
320#
321
322ENTRY(bn_add_words,0)
323 movl 4(%ap),%r2 # r
324 movl 8(%ap),%r3 # a
325 movl 12(%ap),%r4 # b
326 movl 16(%ap),%r5 # n
327 clrl %r0
328
329 tstl %r5
330 bleq 1f
331
3320: movl (%r3)+,%r1 # carry untouched
333 adwc (%r4)+,%r1 # carry used and touched
334 movl %r1,(%r2)+ # carry untouched
335 sobgtr %r5,0b # carry untouched
336
337 adwc $0,%r0
3381: ret
339
340#;
341#; Richard Levitte 20-Nov-2000
342#;
343#; ULONG bn_sub_words(ULONG r[], ULONG a[], ULONG b[], int n) {
344#; ULONG c = 0;
345#; int i;
346#; for (i = 0; i < n; i++) <c,r[i]> = a[i] - b[i] - c;
347#; return(c);
348#; }
349#
350
351ENTRY(bn_sub_words,R6)
352 movl 4(%ap),%r2 # r
353 movl 8(%ap),%r3 # a
354 movl 12(%ap),%r4 # b
355 movl 16(%ap),%r5 # n
356 clrl %r0
357
358 tstl %r5
359 bleq 1f
360
3610: movl (%r3)+,%r6 # carry untouched
362 sbwc (%r4)+,%r6 # carry used and touched
363 movl %r6,(%r2)+ # carry untouched
364 sobgtr %r5,0b # carry untouched
365
3661: adwc $0,%r0
367 ret
368
369#
370# Ragge 20-Sep-2003
371#
372# Multiply a vector of 4/8 longword by another.
373# Uses two loops and 16/64 emuls.
374#
375
376ENTRY(bn_mul_comba4,R6|R7|R8|R9)
377 movl $4,%r9 # 4*4
378 brb 6f
379
380ENTRY(bn_mul_comba8,R6|R7|R8|R9)
381 movl $8,%r9 # 8*8
382
3836: movl 8(%ap),%r3 # a[]
384 movl 12(%ap),%r7 # b[]
385 brb 5f
386
387ENTRY(bn_sqr_comba4,R6|R7|R8|R9)
388 movl $4,%r9 # 4*4
389 brb 0f
390
391ENTRY(bn_sqr_comba8,R6|R7|R8|R9)
392 movl $8,%r9 # 8*8
393
3940:
395 movl 8(%ap),%r3 # a[]
396 movl %r3,%r7 # a[]
397
3985: movl 4(%ap),%r5 # r[]
399 movl %r9,%r8
400
401 clrq (%r5) # clear destinatino, for add.
402 clrq 8(%r5)
403 clrq 16(%r5) # these only needed for comba8
404 clrq 24(%r5)
405
4062: clrl %r4 # carry
407 movl %r9,%r6 # inner loop count
408 movl (%r7)+,%r2 # value to multiply with
409
4101: emul %r2,(%r3),%r4,%r0
411 tstl %r4
412 bgeq 3f
413 incl %r1
4143: tstl %r2
415 bgeq 3f
416 addl2 (%r3),%r1
4173: tstl (%r3)
418 bgeq 3f
419 addl2 %r2,%r1
420
4213: addl2 %r0,(%r5)+ # add to destination
422 adwc $0,%r1 # remember carry
423 movl %r1,%r4 # add carry in next emul
424 addl2 $4,%r3
425 sobgtr %r6,1b
426
427 movl %r4,(%r5) # save highest add result
428
429 ashl $2,%r9,%r4
430 subl2 %r4,%r3
431 subl2 $4,%r4
432 subl2 %r4,%r5
433
434 sobgtr %r8,2b
435
436 ret
diff --git a/src/lib/libcrypto/arch/vax/opensslconf.h b/src/lib/libcrypto/arch/vax/opensslconf.h
deleted file mode 100644
index e3795ce73a..0000000000
--- a/src/lib/libcrypto/arch/vax/opensslconf.h
+++ /dev/null
@@ -1,157 +0,0 @@
1#include <openssl/opensslfeatures.h>
2/* crypto/opensslconf.h.in */
3
4/* Generate 80386 code? */
5#undef I386_ONLY
6
7#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
8#define OPENSSLDIR "/etc/ssl"
9#endif
10
11#undef OPENSSL_UNISTD
12#define OPENSSL_UNISTD <unistd.h>
13
14#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
15
16#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
17#define IDEA_INT unsigned int
18#endif
19
20#if defined(HEADER_MD2_H) && !defined(MD2_INT)
21#define MD2_INT unsigned int
22#endif
23
24#if defined(HEADER_RC2_H) && !defined(RC2_INT)
25/* I need to put in a mod for the alpha - eay */
26#define RC2_INT unsigned int
27#endif
28
29#if defined(HEADER_RC4_H)
30#if !defined(RC4_INT)
31/* using int types make the structure larger but make the code faster
32 * on most boxes I have tested - up to %20 faster. */
33/*
34 * I don't know what does "most" mean, but declaring "int" is a must on:
35 * - Intel P6 because partial register stalls are very expensive;
36 * - elder Alpha because it lacks byte load/store instructions;
37 */
38#define RC4_INT unsigned int
39#endif
40#if !defined(RC4_CHUNK)
41/*
42 * This enables code handling data aligned at natural CPU word
43 * boundary. See crypto/rc4/rc4_enc.c for further details.
44 */
45#undef RC4_CHUNK
46#endif
47#endif
48
49#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
50/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
51 * %20 speed up (longs are 8 bytes, int's are 4). */
52#ifndef DES_LONG
53#define DES_LONG unsigned int
54#endif
55#endif
56
57#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
58#define CONFIG_HEADER_BN_H
59#define BN_LLONG
60
61/* Should we define BN_DIV2W here? */
62
63/* Only one for the following should be defined */
64/* The prime number generation stuff may not work when
65 * EIGHT_BIT but I don't care since I've only used this mode
66 * for debuging the bignum libraries */
67#undef SIXTY_FOUR_BIT_LONG
68#undef SIXTY_FOUR_BIT
69#define THIRTY_TWO_BIT
70#undef SIXTEEN_BIT
71#undef EIGHT_BIT
72#endif
73
74#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
75#define CONFIG_HEADER_RC4_LOCL_H
76/* if this is defined data[i] is used instead of *data, this is a %20
77 * speedup on x86 */
78#define RC4_INDEX
79#endif
80
81#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
82#define CONFIG_HEADER_BF_LOCL_H
83#undef BF_PTR
84#endif /* HEADER_BF_LOCL_H */
85
86#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
87#define CONFIG_HEADER_DES_LOCL_H
88#ifndef DES_DEFAULT_OPTIONS
89/* the following is tweaked from a config script, that is why it is a
90 * protected undef/define */
91#ifndef DES_PTR
92#undef DES_PTR
93#endif
94
95/* This helps C compiler generate the correct code for multiple functional
96 * units. It reduces register dependancies at the expense of 2 more
97 * registers */
98#ifndef DES_RISC1
99#undef DES_RISC1
100#endif
101
102#ifndef DES_RISC2
103#undef DES_RISC2
104#endif
105
106#if defined(DES_RISC1) && defined(DES_RISC2)
107YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
108#endif
109
110/* Unroll the inner loop, this sometimes helps, sometimes hinders.
111 * Very mucy CPU dependant */
112#ifndef DES_UNROLL
113#define DES_UNROLL
114#endif
115
116/* These default values were supplied by
117 * Peter Gutman <pgut001@cs.auckland.ac.nz>
118 * They are only used if nothing else has been defined */
119#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
120/* Special defines which change the way the code is built depending on the
121 CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
122 even newer MIPS CPU's, but at the moment one size fits all for
123 optimization options. Older Sparc's work better with only UNROLL, but
124 there's no way to tell at compile time what it is you're running on */
125
126#if defined( sun ) /* Newer Sparc's */
127# define DES_PTR
128# define DES_RISC1
129# define DES_UNROLL
130#elif defined( __ultrix ) /* Older MIPS */
131# define DES_PTR
132# define DES_RISC2
133# define DES_UNROLL
134#elif defined( __osf1__ ) /* Alpha */
135# define DES_PTR
136# define DES_RISC2
137#elif defined ( _AIX ) /* RS6000 */
138 /* Unknown */
139#elif defined( __hpux ) /* HP-PA */
140 /* Unknown */
141#elif defined( __aux ) /* 68K */
142 /* Unknown */
143#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
144# define DES_UNROLL
145#elif defined( __sgi ) /* Newer MIPS */
146# define DES_PTR
147# define DES_RISC2
148# define DES_UNROLL
149#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
150# define DES_PTR
151# define DES_RISC1
152# define DES_UNROLL
153#endif /* Systems-specific speed defines */
154#endif
155
156#endif /* DES_DEFAULT_OPTIONS */
157#endif /* HEADER_DES_LOCL_H */
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-03 17:09:55 +0000