From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 13 16:29:05 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7B49F106566B;
	Sat, 13 Jun 2009 16:29:05 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 69C458FC16;
	Sat, 13 Jun 2009 16:29:05 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5DGT5Gs018851;
	Sat, 13 Jun 2009 16:29:05 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5DGT5fG018850;
	Sat, 13 Jun 2009 16:29:05 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <200906131629.n5DGT5fG018850@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Sat, 13 Jun 2009 16:29:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194119 -
	projects/openssl_098_merge_8/secure/lib/libcrypto
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2009 16:29:05 -0000

Author: simon
Date: Sat Jun 13 16:29:05 2009
New Revision: 194119
URL: http://svn.freebsd.org/changeset/base/194119

Log:
  Enable the symmetric key block cipher SEED.
  
  This is not done by default in stock OpenSSL 0.9.8k, but I don't really
  see this causing problems.  It is enabled by default in OpenSSL 1.0.
  
  This also fixes a build error (as we don't define OPENSSL_NO_SEED).

Modified:
  projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile

Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile
==============================================================================
--- projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile	Sat Jun 13 15:39:12 2009	(r194118)
+++ projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile	Sat Jun 13 16:29:05 2009	(r194119)
@@ -333,6 +333,10 @@ INCS+=	cms.h
 SRCS+=	jpake.c jpake_err.c
 INCS+=	jpake.h
 
+# seed
+SRCS+=	seed.c seed_ecb.c seed_cbc.c seed_cfb.c seed_ofb.c
+INCS+=	seed.h
+
 SRCS+=	buildinf.h
 INCS+=	opensslconf.h evp.h
 INCSDIR=	${INCLUDEDIR}/openssl
@@ -435,6 +439,7 @@ _ideapath=	${LCRYPTO_SRC}/crypto/idea
 	${LCRYPTO_SRC}/crypto/rc5 \
 	${LCRYPTO_SRC}/crypto/ripemd \
 	${LCRYPTO_SRC}/crypto/rsa \
+	${LCRYPTO_SRC}/crypto/seed \
 	${LCRYPTO_SRC}/crypto/sha \
 	${LCRYPTO_SRC}/crypto/stack \
 	${LCRYPTO_SRC}/crypto/store \