From owner-svn-src-projects@freebsd.org Thu Sep 20 21:59:49 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 344AD10AAF99 for ; Thu, 20 Sep 2018 21:59:49 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CA436821B4; Thu, 20 Sep 2018 21:59:48 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BFA5823CEC; Thu, 20 Sep 2018 21:59:48 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8KLxmG3075216; Thu, 20 Sep 2018 21:59:48 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8KLxlp9075212; Thu, 20 Sep 2018 21:59:47 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201809202159.w8KLxlp9075212@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 20 Sep 2018 21:59:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r338844 - in projects/openssl111/secure/lib/libcrypto/engines: . capi lib4758cca libaep libatalla libcapi libchil libcswift libgost libnuron libsureware libubsec padlock X-SVN-Group: projects X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: in projects/openssl111/secure/lib/libcrypto/engines: . capi lib4758cca libaep libatalla libcapi libchil libcswift libgost libnuron libsureware libubsec padlock X-SVN-Commit-Revision: 338844 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Sep 2018 21:59:49 -0000 Author: jkim Date: Thu Sep 20 21:59:47 2018 New Revision: 338844 URL: https://svnweb.freebsd.org/changeset/base/338844 Log: Connect engines to the build. Added: projects/openssl111/secure/lib/libcrypto/engines/capi/ projects/openssl111/secure/lib/libcrypto/engines/capi/Makefile (contents, props changed) projects/openssl111/secure/lib/libcrypto/engines/padlock/ projects/openssl111/secure/lib/libcrypto/engines/padlock/Makefile (contents, props changed) Deleted: projects/openssl111/secure/lib/libcrypto/engines/lib4758cca/ projects/openssl111/secure/lib/libcrypto/engines/libaep/ projects/openssl111/secure/lib/libcrypto/engines/libatalla/ projects/openssl111/secure/lib/libcrypto/engines/libcapi/ projects/openssl111/secure/lib/libcrypto/engines/libchil/ projects/openssl111/secure/lib/libcrypto/engines/libcswift/ projects/openssl111/secure/lib/libcrypto/engines/libgost/ projects/openssl111/secure/lib/libcrypto/engines/libnuron/ projects/openssl111/secure/lib/libcrypto/engines/libsureware/ projects/openssl111/secure/lib/libcrypto/engines/libubsec/ Modified: projects/openssl111/secure/lib/libcrypto/engines/Makefile projects/openssl111/secure/lib/libcrypto/engines/Makefile.inc Modified: projects/openssl111/secure/lib/libcrypto/engines/Makefile ============================================================================== --- projects/openssl111/secure/lib/libcrypto/engines/Makefile Thu Sep 20 21:36:52 2018 (r338843) +++ projects/openssl111/secure/lib/libcrypto/engines/Makefile Thu Sep 20 21:59:47 2018 (r338844) @@ -1,6 +1,9 @@ # $FreeBSD$ -#SUBDIR= lib4758cca libaep libatalla libcapi libchil libcswift libgost \ -# libnuron libsureware libubsec +SUBDIR= capi +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" +SUBDIR+= padlock +.endif SUBDIR_PARALLEL= + .include Modified: projects/openssl111/secure/lib/libcrypto/engines/Makefile.inc ============================================================================== --- projects/openssl111/secure/lib/libcrypto/engines/Makefile.inc Thu Sep 20 21:36:52 2018 (r338843) +++ projects/openssl111/secure/lib/libcrypto/engines/Makefile.inc Thu Sep 20 21:59:47 2018 (r338844) @@ -1,6 +1,20 @@ # $FreeBSD$ +SHLIBDIR?= /usr/lib/engines + LCRYPTO_SRC= ${SRCTOP}/crypto/openssl -.PATH: ${LCRYPTO_SRC}/engines ${LCRYPTO_SRC}/engines/ccgost -SHLIBDIR?= /usr/lib/engines +CFLAGS+= -I${LCRYPTO_SRC}/engines +CFLAGS+= -I${LCRYPTO_SRC}/include +CFLAGS+= -I${OBJTOP}/secure/lib/libcrypto + +.include + +.if ${TARGET_ENDIANNESS} == 1234 +CFLAGS+= -DL_ENDIAN +.elif ${TARGET_ENDIANNESS} == 4321 +CFLAGS+= -DB_ENDIAN +.endif +CFLAGS+= -DNDEBUG + +.PATH: ${LCRYPTO_SRC}/engines Added: projects/openssl111/secure/lib/libcrypto/engines/capi/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/openssl111/secure/lib/libcrypto/engines/capi/Makefile Thu Sep 20 21:59:47 2018 (r338844) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +SHLIB_NAME?= capi.so + +SRCS= e_capi.c + +.include Added: projects/openssl111/secure/lib/libcrypto/engines/padlock/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/openssl111/secure/lib/libcrypto/engines/padlock/Makefile Thu Sep 20 21:59:47 2018 (r338844) @@ -0,0 +1,14 @@ +# $FreeBSD$ + +SHLIB_NAME?= padlock.so + +SRCS= e_padlock.c +.if ${MACHINE_CPUARCH} == "amd64" +SRCS+= e_padlock-x86_64.S +.elif ${MACHINE_CPUARCH} == "i386" +SRCS+= e_padlock-x86.S +.endif + +.include + +.PATH: ${.CURDIR:H:H}/${MACHINE_CPUARCH}