Add support for AArch64.

author: patrick <> 2017-01-11 18:11:01 +0000
committer: patrick <> 2017-01-11 18:11:01 +0000
commit: 4947258c8e735049c8bbdd076c4d73100c0a08a2 (patch)
tree: 9e30e7558b6ed6a10b38eaebac1319c61d203752 /src/lib/libcrypto/arch
parent: 5d4e6e59ce6a89ade76b258492a323c5d3fa668a (diff)
download: openbsd-4947258c8e735049c8bbdd076c4d73100c0a08a2.tar.gz
openbsd-4947258c8e735049c8bbdd076c4d73100c0a08a2.tar.bz2
openbsd-4947258c8e735049c8bbdd076c4d73100c0a08a2.zip
2 files changed, 182 insertions, 0 deletions
diff --git a/src/lib/libcrypto/arch/aarch64/Makefile.inc b/src/lib/libcrypto/arch/aarch64/Makefile.inc
new file mode 100644
index 0000000000..8742504f2d
--- /dev/null
+++ b/src/lib/libcrypto/arch/aarch64/Makefile.inc
@@ -0,0 +1,28 @@
+# $OpenBSD: Makefile.inc,v 1.1 2017/01/11 18:11:01 patrick Exp $
+# aarch64-specific libcrypto build rules
+# aes
+SRCS+= aes_core.c aes_cbc.c
+# bf
+SRCS+= bf_enc.c
+# bn
+SRCS+= bn_asm.c
+# camellia
+SRCS+= camellia.c cmll_cbc.c cmll_misc.c
+# des
+SRCS+= des_enc.c fcrypt_b.c
+# modes
+# rc4
+SRCS+= rc4_enc.c rc4_skey.c
+# sha
+# whrlpool
+SRCS+= wp_block.c
+.for dir f in ${SSLASM}
+SRCS+=  ${f}.S
+GENERATED+=${f}.S
+${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl
+        /usr/bin/perl \
+                ${LCRYPTO_SRC}/${dir}/asm/${f}.pl void ${.TARGET} > ${.TARGET}
+.endfor
diff --git a/src/lib/libcrypto/arch/aarch64/opensslconf.h b/src/lib/libcrypto/arch/aarch64/opensslconf.h
new file mode 100644
index 0000000000..ab3e2d89b0
--- /dev/null
+++ b/src/lib/libcrypto/arch/aarch64/opensslconf.h
@@ -0,0 +1,154 @@
+#include <openssl/opensslfeatures.h>
+/* crypto/opensslconf.h.in */
+#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
+#define OPENSSLDIR "/etc/ssl"
+#endif
+#undef OPENSSL_UNISTD
+#define OPENSSL_UNISTD <unistd.h>
+#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
+#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
+#define IDEA_INT unsigned int
+#endif
+#if defined(HEADER_MD2_H) && !defined(MD2_INT)
+#define MD2_INT unsigned int
+#endif
+#if defined(HEADER_RC2_H) && !defined(RC2_INT)
+/* I need to put in a mod for the alpha - eay */
+#define RC2_INT unsigned int
+#endif
+#if defined(HEADER_RC4_H)
+#if !defined(RC4_INT)
+/* using int types make the structure larger but make the code faster
+ * on most boxes I have tested - up to %20 faster. */
+/*
+ * I don't know what does "most" mean, but declaring "int" is a must on:
+ * - Intel P6 because partial register stalls are very expensive;
+ * - elder Alpha because it lacks byte load/store instructions;
+ */
+#define RC4_INT unsigned int
+#endif
+#if !defined(RC4_CHUNK)
+/*
+ * This enables code handling data aligned at natural CPU word
+ * boundary. See crypto/rc4/rc4_enc.c for further details.
+ */
+#define RC4_CHUNK unsigned long
+#endif
+#endif
+#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
+/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
+ * %20 speed up (longs are 8 bytes, int's are 4). */
+#ifndef DES_LONG
+#define DES_LONG unsigned int
+#endif
+#endif
+#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
+#define CONFIG_HEADER_BN_H
+#undef BN_LLONG
+/* Should we define BN_DIV2W here? */
+/* Only one for the following should be defined */
+/* The prime number generation stuff may not work when
+ * EIGHT_BIT but I don't care since I've only used this mode
+ * for debuging the bignum libraries */
+#define SIXTY_FOUR_BIT_LONG
+#undef SIXTY_FOUR_BIT
+#undef THIRTY_TWO_BIT
+#undef SIXTEEN_BIT
+#undef EIGHT_BIT
+#endif
+#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
+#define CONFIG_HEADER_RC4_LOCL_H
+/* if this is defined data[i] is used instead of *data, this is a %20
+ * speedup on x86 */
+#undef RC4_INDEX
+#endif
+#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
+#define CONFIG_HEADER_BF_LOCL_H
+#undef BF_PTR
+#endif /* HEADER_BF_LOCL_H */
+#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
+#define CONFIG_HEADER_DES_LOCL_H
+#ifndef DES_DEFAULT_OPTIONS
+/* the following is tweaked from a config script, that is why it is a
+ * protected undef/define */
+#ifndef DES_PTR
+#undef DES_PTR
+#endif
+/* This helps C compiler generate the correct code for multiple functional
+ * units.  It reduces register dependancies at the expense of 2 more
+ * registers */
+#ifndef DES_RISC1
+#undef DES_RISC1
+#endif
+#ifndef DES_RISC2
+#undef DES_RISC2
+#endif
+#if defined(DES_RISC1) && defined(DES_RISC2)
+YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
+#endif
+/* Unroll the inner loop, this sometimes helps, sometimes hinders.
+ * Very mucy CPU dependant */
+#ifndef DES_UNROLL
+#define DES_UNROLL
+#endif
+/* These default values were supplied by
+ * Peter Gutman <pgut001@cs.auckland.ac.nz>
+ * They are only used if nothing else has been defined */
+#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
+/* Special defines which change the way the code is built depending on the
+   CPU and OS.  For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
+   even newer MIPS CPU's, but at the moment one size fits all for
+   optimization options.  Older Sparc's work better with only UNROLL, but
+   there's no way to tell at compile time what it is you're running on */
+ 
+#if defined( sun )              /* Newer Sparc's */
+#  define DES_PTR
+#  define DES_RISC1
+#  define DES_UNROLL
+#elif defined( __ultrix )       /* Older MIPS */
+#  define DES_PTR
+#  define DES_RISC2
+#  define DES_UNROLL
+#elif defined( __osf1__ )       /* Alpha */
+#  define DES_PTR
+#  define DES_RISC2
+#elif defined ( _AIX )          /* RS6000 */
+  /* Unknown */
+#elif defined( __hpux )         /* HP-PA */
+  /* Unknown */
+#elif defined( __aux )          /* 68K */
+  /* Unknown */
+#elif defined( __dgux )         /* 88K (but P6 in latest boxes) */
+#  define DES_UNROLL
+#elif defined( __sgi )          /* Newer MIPS */
+#  define DES_PTR
+#  define DES_RISC2
+#  define DES_UNROLL
+#elif defined(i386) || defined(__i386__)        /* x86 boxes, should be gcc */
+#  define DES_PTR
+#  define DES_RISC1
+#  define DES_UNROLL
+#endif /* Systems-specific speed defines */
+#endif
+#endif /* DES_DEFAULT_OPTIONS */
+#endif /* HEADER_DES_LOCL_H */
author	patrick <>	2017-01-11 18:11:01 +0000
committer	patrick <>	2017-01-11 18:11:01 +0000
commit	4947258c8e735049c8bbdd076c4d73100c0a08a2 (patch)
tree	9e30e7558b6ed6a10b38eaebac1319c61d203752 /src/lib/libcrypto/arch
parent	5d4e6e59ce6a89ade76b258492a323c5d3fa668a (diff)
download	openbsd-4947258c8e735049c8bbdd076c4d73100c0a08a2.tar.gz openbsd-4947258c8e735049c8bbdd076c4d73100c0a08a2.tar.bz2 openbsd-4947258c8e735049c8bbdd076c4d73100c0a08a2.zip

diff --git a/src/lib/libcrypto/arch/aarch64/Makefile.inc b/src/lib/libcrypto/arch/aarch64/Makefile.inc new file mode 100644 index 0000000000..8742504f2d --- /dev/null +++ b/src/lib/libcrypto/arch/aarch64/Makefile.inc
@@ -0,0 +1,28 @@
	1	# $OpenBSD: Makefile.inc,v 1.1 2017/01/11 18:11:01 patrick Exp $
	2
	3	# aarch64-specific libcrypto build rules
	4
	5	# aes
	6	SRCS+= aes_core.c aes_cbc.c
	7	# bf
	8	SRCS+= bf_enc.c
	9	# bn
	10	SRCS+= bn_asm.c
	11	# camellia
	12	SRCS+= camellia.c cmll_cbc.c cmll_misc.c
	13	# des
	14	SRCS+= des_enc.c fcrypt_b.c
	15	# modes
	16	# rc4
	17	SRCS+= rc4_enc.c rc4_skey.c
	18	# sha
	19	# whrlpool
	20	SRCS+= wp_block.c
	21
	22	.for dir f in ${SSLASM}
	23	SRCS+= ${f}.S
	24	GENERATED+=${f}.S
	25	${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl
	26	/usr/bin/perl \
	27	${LCRYPTO_SRC}/${dir}/asm/${f}.pl void ${.TARGET} > ${.TARGET}
	28	.endfor


diff --git a/src/lib/libcrypto/arch/aarch64/opensslconf.h b/src/lib/libcrypto/arch/aarch64/opensslconf.h new file mode 100644 index 0000000000..ab3e2d89b0 --- /dev/null +++ b/src/lib/libcrypto/arch/aarch64/opensslconf.h
@@ -0,0 +1,154 @@
	1	#include <openssl/opensslfeatures.h>
	2	/* crypto/opensslconf.h.in */
	3
	4	#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
	5	#define OPENSSLDIR "/etc/ssl"
	6	#endif
	7
	8	#undef OPENSSL_UNISTD
	9	#define OPENSSL_UNISTD <unistd.h>
	10
	11	#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
	12
	13	#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
	14	#define IDEA_INT unsigned int
	15	#endif
	16
	17	#if defined(HEADER_MD2_H) && !defined(MD2_INT)
	18	#define MD2_INT unsigned int
	19	#endif
	20
	21	#if defined(HEADER_RC2_H) && !defined(RC2_INT)
	22	/* I need to put in a mod for the alpha - eay */
	23	#define RC2_INT unsigned int
	24	#endif
	25
	26	#if defined(HEADER_RC4_H)
	27	#if !defined(RC4_INT)
	28	/* using int types make the structure larger but make the code faster
	29	* on most boxes I have tested - up to %20 faster. */
	30	/*
	31	* I don't know what does "most" mean, but declaring "int" is a must on:
	32	* - Intel P6 because partial register stalls are very expensive;
	33	* - elder Alpha because it lacks byte load/store instructions;
	34	*/
	35	#define RC4_INT unsigned int
	36	#endif
	37	#if !defined(RC4_CHUNK)
	38	/*
	39	* This enables code handling data aligned at natural CPU word
	40	* boundary. See crypto/rc4/rc4_enc.c for further details.
	41	*/
	42	#define RC4_CHUNK unsigned long
	43	#endif
	44	#endif
	45
	46	#if (defined(HEADER_NEW_DES_H) \|\| defined(HEADER_DES_H)) && !defined(DES_LONG)
	47	/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
	48	* %20 speed up (longs are 8 bytes, int's are 4). */
	49	#ifndef DES_LONG
	50	#define DES_LONG unsigned int
	51	#endif
	52	#endif
	53
	54	#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
	55	#define CONFIG_HEADER_BN_H
	56	#undef BN_LLONG
	57
	58	/* Should we define BN_DIV2W here? */
	59
	60	/* Only one for the following should be defined */
	61	/* The prime number generation stuff may not work when
	62	* EIGHT_BIT but I don't care since I've only used this mode
	63	* for debuging the bignum libraries */
	64	#define SIXTY_FOUR_BIT_LONG
	65	#undef SIXTY_FOUR_BIT
	66	#undef THIRTY_TWO_BIT
	67	#undef SIXTEEN_BIT
	68	#undef EIGHT_BIT
	69	#endif
	70
	71	#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
	72	#define CONFIG_HEADER_RC4_LOCL_H
	73	/* if this is defined data[i] is used instead of *data, this is a %20
	74	* speedup on x86 */
	75	#undef RC4_INDEX
	76	#endif
	77
	78	#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
	79	#define CONFIG_HEADER_BF_LOCL_H
	80	#undef BF_PTR
	81	#endif /* HEADER_BF_LOCL_H */
	82
	83	#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
	84	#define CONFIG_HEADER_DES_LOCL_H
	85	#ifndef DES_DEFAULT_OPTIONS
	86	/* the following is tweaked from a config script, that is why it is a
	87	* protected undef/define */
	88	#ifndef DES_PTR
	89	#undef DES_PTR
	90	#endif
	91
	92	/* This helps C compiler generate the correct code for multiple functional
	93	* units. It reduces register dependancies at the expense of 2 more
	94	* registers */
	95	#ifndef DES_RISC1
	96	#undef DES_RISC1
	97	#endif
	98
	99	#ifndef DES_RISC2
	100	#undef DES_RISC2
	101	#endif
	102
	103	#if defined(DES_RISC1) && defined(DES_RISC2)
	104	YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
	105	#endif
	106
	107	/* Unroll the inner loop, this sometimes helps, sometimes hinders.
	108	* Very mucy CPU dependant */
	109	#ifndef DES_UNROLL
	110	#define DES_UNROLL
	111	#endif
	112
	113	/* These default values were supplied by
	114	* Peter Gutman <pgut001@cs.auckland.ac.nz>
	115	* They are only used if nothing else has been defined */
	116	#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
	117	/* Special defines which change the way the code is built depending on the
	118	CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
	119	even newer MIPS CPU's, but at the moment one size fits all for
	120	optimization options. Older Sparc's work better with only UNROLL, but
	121	there's no way to tell at compile time what it is you're running on */
	122
	123	#if defined( sun ) /* Newer Sparc's */
	124	# define DES_PTR
	125	# define DES_RISC1
	126	# define DES_UNROLL
	127	#elif defined( __ultrix ) /* Older MIPS */
	128	# define DES_PTR
	129	# define DES_RISC2
	130	# define DES_UNROLL
	131	#elif defined( __osf1__ ) /* Alpha */
	132	# define DES_PTR
	133	# define DES_RISC2
	134	#elif defined ( _AIX ) /* RS6000 */
	135	/* Unknown */
	136	#elif defined( __hpux ) /* HP-PA */
	137	/* Unknown */
	138	#elif defined( __aux ) /* 68K */
	139	/* Unknown */
	140	#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
	141	# define DES_UNROLL
	142	#elif defined( __sgi ) /* Newer MIPS */
	143	# define DES_PTR
	144	# define DES_RISC2
	145	# define DES_UNROLL
	146	#elif defined(i386) \|\| defined(__i386__) /* x86 boxes, should be gcc */
	147	# define DES_PTR
	148	# define DES_RISC1
	149	# define DES_UNROLL
	150	#endif /* Systems-specific speed defines */
	151	#endif
	152
	153	#endif /* DES_DEFAULT_OPTIONS */
	154	#endif /* HEADER_DES_LOCL_H */