Index: head/security/opencryptoki/Makefile
===================================================================
--- head/security/opencryptoki/Makefile	(revision 421967)
+++ head/security/opencryptoki/Makefile	(revision 421968)
@@ -1,60 +1,59 @@
 # Created by: Ralf Meister
 # $FreeBSD$
 
 PORTNAME=	opencryptoki
 PORTVERSION=	3.5
 PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Open PKCS\#11 implementation library
 
 LICENSE=	CPL
 LICENSE_NAME=	Common Public License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libtspi.so:security/trousers
 
-USES=		alias autoreconf gmake libtool tar:tgz
+USES=		alias autoreconf gmake libtool ssl tar:tgz
 USE_LDCONFIG=	${PREFIX}/lib/opencryptoki
-USE_OPENSSL=	yes
 .if exists(/usr/include/openssl/md2.h)
 WITH_OPENSSL_PORT=yes
 .endif
 WRKSRC=		${WRKDIR}/${PORTNAME}
 INSTALL_TARGET=	install-strip
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-swtok --enable-tpmtok \
 		--disable-crtok --disable-aeptok \
 		--disable-ccatok --disable-bcomtok \
 		--disable-pkcscca_migrate \
 		--with-lockdir=/var/run/opencryptoki \
 		--with-logdir=/var/log/opencryptoki \
 		--localstatedir=/var \
 		--with-openssl=${OPENSSLBASE} \
 		--with-pkcs11user=${USERS} \
 		--with-pkcs11group=${GROUPS} \
 		ac_cv_path_CHGRP=true
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_RC_SUBR=	pkcsslotd
 SUB_FILES=	pkg-message
 SUB_LIST=	USERS="${USERS}" GROUPS="${GROUPS}"
 PLIST_SUB=	USERS="${USERS}" GROUPS="${GROUPS}"
 USERS=		_pkcs11
 GROUPS=		_pkcs11
 
 OPTIONS_DEFINE=	LDAP
 OPTIONS_SUB=	yes
 LDAP_CONFIGURE_ENABLE=	icsf
 LDAP_USE=	OPENLDAP=yes
 
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/opencryptoki.conf \
 	    ${STAGEDIR}${ETCDIR}/opencryptoki.conf.sample
 	${RMDIR} ${STAGEDIR}/var/run/opencryptoki/* \
 	    ${STAGEDIR}/var/run/opencryptoki
 
 .include <bsd.port.mk>
Index: head/security/opencryptoki/files/patch-usr_lib_pkcs11_common_sw__crypt.c
===================================================================
--- head/security/opencryptoki/files/patch-usr_lib_pkcs11_common_sw__crypt.c	(nonexistent)
+++ head/security/opencryptoki/files/patch-usr_lib_pkcs11_common_sw__crypt.c	(revision 421968)
@@ -0,0 +1,62 @@
+--- usr/lib/pkcs11/common/sw_crypt.c.orig	2016-04-29 17:26:46 UTC
++++ usr/lib/pkcs11/common/sw_crypt.c
+@@ -309,12 +309,12 @@ sw_des3_cbc(CK_BYTE * in_data,
+ 	    CK_BYTE  *key_value,
+ 	    CK_BYTE  encrypt)
+ {
+-	des_key_schedule des_key1;
+-	des_key_schedule des_key2;
+-	des_key_schedule des_key3;
++	DES_key_schedule des_key1;
++	DES_key_schedule des_key2;
++	DES_key_schedule des_key3;
+ 
+-	const_des_cblock key_SSL1, key_SSL2, key_SSL3;
+-	des_cblock ivec;
++	const_DES_cblock key_SSL1, key_SSL2, key_SSL3;
++	DES_cblock ivec;
+ 
+ 	// the des decrypt will only fail if the data length is not evenly divisible
+ 	// by 8
+@@ -328,30 +328,30 @@ sw_des3_cbc(CK_BYTE * in_data,
+ 	memcpy(&key_SSL1, key_value, (size_t)8);
+ 	memcpy(&key_SSL2, key_value+8, (size_t)8);
+ 	memcpy(&key_SSL3, key_value+16, (size_t)8);
+-	des_set_key_unchecked(&key_SSL1, des_key1);
+-	des_set_key_unchecked(&key_SSL2, des_key2);
+-	des_set_key_unchecked(&key_SSL3, des_key3);
++	DES_set_key_unchecked(&key_SSL1, &des_key1);
++	DES_set_key_unchecked(&key_SSL2, &des_key2);
++	DES_set_key_unchecked(&key_SSL3, &des_key3);
+ 
+ 	memcpy(ivec, init_v, sizeof(ivec));
+ 
+ 	// Encrypt or decrypt the data
+ 	if (encrypt) {
+-		des_ede3_cbc_encrypt(in_data,
++		DES_ede3_cbc_encrypt(in_data,
+ 				out_data,
+ 				in_data_len,
+-				des_key1,
+-				des_key2,
+-				des_key3,
++				&des_key1,
++				&des_key2,
++				&des_key3,
+ 				&ivec,
+ 				DES_ENCRYPT);
+ 		*out_data_len = in_data_len;
+ 	} else {
+-		des_ede3_cbc_encrypt(in_data,
++		DES_ede3_cbc_encrypt(in_data,
+ 				out_data,
+ 				in_data_len,
+-				des_key1,
+-				des_key2,
+-				des_key3,
++				&des_key1,
++				&des_key2,
++				&des_key3,
+ 				&ivec,
+ 				DES_DECRYPT);
+ 

Property changes on: head/security/opencryptoki/files/patch-usr_lib_pkcs11_common_sw__crypt.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property