svn commit: lorikeet r776 - in trunk/heimdal: . cf

[lha at samba.org]

Author: lha
Date: 2007-07-17 15:55:03 +0000 (Tue, 17 Jul 2007)
New Revision: 776

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=776

Log:
Merged with Heimdal svn revision 21642
Modified:
   trunk/heimdal/cf/ChangeLog
   trunk/heimdal/cf/crypto.m4
   trunk/heimdal/configure.in


Changeset:
Modified: trunk/heimdal/cf/ChangeLog
===================================================================
--- trunk/heimdal/cf/ChangeLog	2007-07-17 14:37:23 UTC (rev 775)
+++ trunk/heimdal/cf/ChangeLog	2007-07-17 15:55:03 UTC (rev 776)
@@ -1,3 +1,7 @@
+2007-07-17  Love Hörnquist Åstrand  <lha at it.su.se>
+
+	* crypto.m4: depend on EVP_CIPHER_iv_length
+
 2007-06-27  Love Hörnquist Åstrand  <lha at it.su.se>
 
 	* Makefile.am.common: Need absolute reference to the top source

Modified: trunk/heimdal/cf/crypto.m4
===================================================================
--- trunk/heimdal/cf/crypto.m4	2007-07-17 14:37:23 UTC (rev 775)
+++ trunk/heimdal/cf/crypto.m4	2007-07-17 15:55:03 UTC (rev 776)
@@ -1,4 +1,4 @@
-dnl $Id: crypto.m4 20466 2007-04-20 08:29:05Z lha $
+dnl $Id: crypto.m4 21640 2007-07-17 14:43:58Z lha $
 dnl
 dnl test for crypto libraries:
 dnl - libcrypto (from openssl)
@@ -46,6 +46,7 @@
 		MD5_Init(&md5);
 		SHA1_Init(&sha1);
 		SHA256_Init(&sha256);
+		EVP_CIPHER_iv_length(0);
 		#ifdef HAVE_OPENSSL
 		RAND_status();
 		UI_UTIL_read_pw_string(0,0,0,0);

Modified: trunk/heimdal/configure.in
===================================================================
--- trunk/heimdal/configure.in	2007-07-17 14:37:23 UTC (rev 775)
+++ trunk/heimdal/configure.in	2007-07-17 15:55:03 UTC (rev 776)
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 21637 $)
+AC_REVISION($Revision: 21642 $)
 AC_PREREQ([2.59])
 test -z "$CFLAGS" && CFLAGS="-g"
-AC_INIT([Lorikeet-Heimdal, modified for Samba4],[0.9rc5-samba],[samba-technical.org])
+AC_INIT([Lorikeet-Heimdal, modified for Samba4],[0.9rc6-samba],[samba-technical.org])
 AC_CONFIG_SRCDIR([kuser/kinit.c])
 AC_CONFIG_HEADERS(include/config.h)