hcrypto: Add X25519

The X25519 implementation comes from libsodium. Explicit copyright
notices have been added to each file as well as some portability changes
(e.g. align.h).

lib/hcrypto/Makefile.am

@@ -10,6 +10,7 @@ endif
 
 AM_CPPFLAGS += -I$(top_srcdir)/lib/hx509 \
 	       -I$(srcdir)/libtommath -DUSE_HCRYPTO_LTM=1 \
+	       -I$(srcdir)/x25519 \
 	       -I$(srcdir)/..
 
 lib_LTLIBRARIES = libhcrypto.la
@@ -55,9 +56,10 @@ hcryptoinclude_HEADERS =	\
 	rsa.h			\
 	sha.h			\
 	ui.h			\
-	undef.h
+	undef.h			\
+	x25519_ref10.h
 
-install-build-headers:: $(hcryptoinclude_HEADERS)
+install-build-headers:: $(hcryptoinclude_HEADERS) $(x25519include_HEADERS)
 	@foo='$(hcryptoinclude_HEADERS)'; \
 	for f in $$foo; do \
 		f=`basename $$f`; \
@@ -107,6 +109,7 @@ test_rand_LDADD = $(LDADD) -lm
 
 libhcrypto_la_SOURCES =	\
 	$(ltmsources)	\
+	$(x25519sources)\
 	aes.c		\
 	aes.h		\
 	bn.c		\
@@ -330,6 +333,10 @@ ltmsources = \
 	libtommath/bn_s_mp_toom_mul.c \
 	libtommath/bn_s_mp_toom_sqr.c
 
+x25519sources = \
+	x25519/ed25519_ref10.c \
+	x25519/x25519_ref10.c
+
 $(libhcrypto_la_OBJECTS) $(test_rand_OBJECTS): hcrypto-link
 
 libhcrypto_la_CPPFLAGS = -DBUILD_HCRYPTO_LIB $(AM_CPPFLAGS)

lib/hcrypto/NTMakefile

@@ -29,7 +29,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 # 
 
-SUBDIRS=libtommath
+SUBDIRS=libtommath x25519
 
 RELDIR=lib\hcrypto
 
@@ -87,7 +87,8 @@ INCFILES=	\
 	$(HCRYPTOINCLUDEDIR)\rsa.h	\
 	$(HCRYPTOINCLUDEDIR)\sha.h	\
 	$(HCRYPTOINCLUDEDIR)\ui.h	\
-	$(HCRYPTOINCLUDEDIR)\undef.h
+	$(HCRYPTOINCLUDEDIR)\undef.h	\
+	$(HCRYPTOINCLUDEDIR)\x25519_ref10.h	\
 
 mkincdir:
 !if !exist($(HCRYPTOINCLUDEDIR))

lib/hcrypto/libhcrypto-exports.def

@@ -350,4 +350,5 @@ EXPORTS
 	hc_EVP_CipherFinal_ex
 
         hc_hcrypto_validate
-
+	hc_hcrypto_scalarmult_curve25519
+	hc_hcrypto_scalarmult_curve25519_base

lib/hcrypto/version-script.map

@@ -334,6 +334,8 @@ HEIMDAL_CRYPTO_1.0 {
 		hc_EVP_CipherUpdate;
 		hc_EVP_CipherFinal_ex;
 		hc_hcrypto_validate;
+		hc_hcrypto_scalarmult_curve25519;
+		hc_hcrypto_scalarmult_curve25519_base;
 	local:
 		*;
 };

lib/hcrypto/x25519/NTMakefile

@@ -0,0 +1,46 @@
+########################################################################
+#
+# Copyright (c) 2009, Secure Endpoints Inc.
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# 
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in
+#   the documentation and/or other materials provided with the
+#   distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# 
+
+RELDIR=lib\hcrypto\x25519
+
+!include ../../../windows/NTMakefile.w32
+
+intcflags=-I$(SRC)\lib\hcrypto
+
+libx25519_OBJs=	\
+	$(OBJ)\ed25519_ref10.obj	\
+	$(OBJ)\x25519_ref10.obj
+
+$(LIBX25519): $(libx25519_OBJs)
+	$(LIBCON)
+
+all:: $(LIBX25519)
+

lib/hcrypto/x25519/align.h

@@ -0,0 +1,7 @@
+#ifndef CRYPTO_ALIGN
+# if defined(__INTEL_COMPILER) || defined(_MSC_VER)
+#  define CRYPTO_ALIGN(x) __declspec(align(x))
+# else
+#  define CRYPTO_ALIGN(x) __attribute__ ((aligned(x)))
+# endif
+#endif