socsvn commit: r269955 - in soc2013/def/crashdump-head: sbin/dumpkey sys/conf sys/crypto sys/crypto/hmac

[def at FreeBSD.org]

Author: def
Date: Mon Jun 23 23:17:06 2014
New Revision: 269955
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269955

Log:
  Remove unused code for XTS mode.

Deleted:
  soc2013/def/crashdump-head/sys/crypto/hmac/
  soc2013/def/crashdump-head/sys/crypto/xts.c
  soc2013/def/crashdump-head/sys/crypto/xts.h
Modified:
  soc2013/def/crashdump-head/sbin/dumpkey/Makefile
  soc2013/def/crashdump-head/sbin/dumpkey/dumpkey.c
  soc2013/def/crashdump-head/sys/conf/files

Modified: soc2013/def/crashdump-head/sbin/dumpkey/Makefile
==============================================================================
--- soc2013/def/crashdump-head/sbin/dumpkey/Makefile	Mon Jun 23 23:15:54 2014	(r269954)
+++ soc2013/def/crashdump-head/sbin/dumpkey/Makefile	Mon Jun 23 23:17:06 2014	(r269955)
@@ -1,13 +1,9 @@
 SYS=	${.CURDIR}/../../sys
-.PATH:	${SYS}/crypto ${SYS}/crypto/rijndael
-.PATH:	${SYS}/crypto/hmac ${SYS}/crypto/sha2
 
 PROG=	dumpkey
 SRCS=	${PROG}.c
-SRCS+=	rijndael-api.c rijndael-api-fst.c rijndael-alg-fst.c
-SRCS+=	hmac.c xts.c sha2.c
+SRCS+=	rijndael-api-fst.c rijndael-alg-fst.c
 CFLAGS+=-I${SYS}
-DPADD+=	${LIBCRYPTO}
 LDADD+=	-lcrypto
 WARNS?=	2
 NO_MAN=

Modified: soc2013/def/crashdump-head/sbin/dumpkey/dumpkey.c
==============================================================================
--- soc2013/def/crashdump-head/sbin/dumpkey/dumpkey.c	Mon Jun 23 23:15:54 2014	(r269954)
+++ soc2013/def/crashdump-head/sbin/dumpkey/dumpkey.c	Mon Jun 23 23:17:06 2014	(r269955)
@@ -6,7 +6,6 @@
 #include <crypto/rijndael/rijndael-api-fst.h>
 #include <opencrypto/cryptodev.h>
 
-#define	OPENSSL_NO_SHA
 #include <openssl/conf.h>
 #include <openssl/err.h>
 #include <openssl/rsa.h>

Modified: soc2013/def/crashdump-head/sys/conf/files
==============================================================================
--- soc2013/def/crashdump-head/sys/conf/files	Mon Jun 23 23:15:54 2014	(r269954)
+++ soc2013/def/crashdump-head/sys/conf/files	Mon Jun 23 23:17:06 2014	(r269955)
@@ -512,7 +512,6 @@
 crypto/camellia/camellia-api.c	optional crypto | ipsec
 crypto/des/des_ecb.c		optional crypto | ipsec | netsmb
 crypto/des/des_setkey.c		optional crypto | ipsec | netsmb
-crypto/hmac/hmac.c		optional crypto | encrypt_crash
 crypto/rc4/rc4.c		optional netgraph_mppc_encryption | kgssapi
 crypto/rijndael/rijndael-alg-fst.c optional crypto | geom_bde | \
 					 ipsec | random | wlan_ccmp
@@ -526,7 +525,6 @@
 					 sctp | zfs
 crypto/siphash/siphash.c	optional inet | inet6
 crypto/siphash/siphash_test.c	optional inet | inet6
-crypto/xts.c			optional crypto | encrypt_crash
 ddb/db_access.c			optional ddb
 ddb/db_break.c			optional ddb
 ddb/db_capture.c		optional ddb