summaryrefslogtreecommitdiffstats
path: root/secure/lib/libcrypto/engines
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2012-07-12 19:30:53 +0000
committerjkim <jkim@FreeBSD.org>2012-07-12 19:30:53 +0000
commite393e47b1e23744a7d0ed999afb5d137070f5f8f (patch)
tree9739a803477c4610ec6628d914bdcc55fbb3602a /secure/lib/libcrypto/engines
parenta8b00dea2cde4c3d96e6ed1de530ddff21012266 (diff)
parent532b4084cb8cac5e6d91d42aa6a497dd4ba4a4f5 (diff)
downloadFreeBSD-src-e393e47b1e23744a7d0ed999afb5d137070f5f8f.zip
FreeBSD-src-e393e47b1e23744a7d0ed999afb5d137070f5f8f.tar.gz
Merge OpenSSL 1.0.1c.
Approved by: benl (maintainer)
Diffstat (limited to 'secure/lib/libcrypto/engines')
-rw-r--r--secure/lib/libcrypto/engines/Makefile2
-rw-r--r--secure/lib/libcrypto/engines/Makefile.inc2
-rw-r--r--secure/lib/libcrypto/engines/libgost/Makefile8
3 files changed, 10 insertions, 2 deletions
diff --git a/secure/lib/libcrypto/engines/Makefile b/secure/lib/libcrypto/engines/Makefile
index 6250527..e29fb87 100644
--- a/secure/lib/libcrypto/engines/Makefile
+++ b/secure/lib/libcrypto/engines/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-SUBDIR= lib4758cca libaep libatalla libcswift libchil libnuron \
+SUBDIR= lib4758cca libaep libatalla libchil libcswift libgost libnuron \
libsureware libubsec
.include <bsd.subdir.mk>
diff --git a/secure/lib/libcrypto/engines/Makefile.inc b/secure/lib/libcrypto/engines/Makefile.inc
index a71820f..3ee4b2d 100644
--- a/secure/lib/libcrypto/engines/Makefile.inc
+++ b/secure/lib/libcrypto/engines/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
LCRYPTO_SRC= ${.CURDIR}/../../../../../crypto/openssl
-.PATH: ${LCRYPTO_SRC}/engines
+.PATH: ${LCRYPTO_SRC}/engines ${LCRYPTO_SRC}/engines/ccgost
SHLIBDIR?= /usr/lib/engines
diff --git a/secure/lib/libcrypto/engines/libgost/Makefile b/secure/lib/libcrypto/engines/libgost/Makefile
new file mode 100644
index 0000000..ad718fa
--- /dev/null
+++ b/secure/lib/libcrypto/engines/libgost/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+SHLIB_NAME?= libgost.so
+SRCS= gost2001.c gost2001_keyx.c gost89.c gost94_keyx.c gost_ameth.c \
+ gost_asn1.c gost_crypt.c gost_ctl.c gost_eng.c gost_keywrap.c \
+ gost_md.c gost_params.c gost_pmeth.c gost_sign.c gosthash.c
+
+.include <bsd.lib.mk>
OpenPOWER on IntegriCloud