[Pkg-openssl-changes] r344 - in openssl/trunk: crypto/engine debian

[kroeckx at alioth.debian.org]

Author: kroeckx
Date: 2008-10-31 22:31:47 +0000 (Fri, 31 Oct 2008)
New Revision: 344

Modified:
   openssl/trunk/crypto/engine/eng_table.c
   openssl/trunk/debian/changelog
Log:
Automaticly use engines that succesfully initialised.  Patch
from the 0.9.8h upstream version.  (Closes: #502177)


Modified: openssl/trunk/crypto/engine/eng_table.c
===================================================================
--- openssl/trunk/crypto/engine/eng_table.c	2008-10-31 22:05:03 UTC (rev 343)
+++ openssl/trunk/crypto/engine/eng_table.c	2008-10-31 22:31:47 UTC (rev 344)
@@ -135,7 +135,7 @@
 			{
 			fnd = OPENSSL_malloc(sizeof(ENGINE_PILE));
 			if(!fnd) goto end;
-			fnd->uptodate = 0;
+			fnd->uptodate = 1;
 			fnd->nid = *nids;
 			fnd->sk = sk_ENGINE_new_null();
 			if(!fnd->sk)
@@ -152,7 +152,7 @@
 		if(!sk_ENGINE_push(fnd->sk, e))
 			goto end;
 		/* "touch" this ENGINE_PILE */
-		fnd->uptodate = 1;
+		fnd->uptodate = 0;
 		if(setdefault)
 			{
 			if(!engine_unlocked_init(e))
@@ -164,6 +164,7 @@
 			if(fnd->funct)
 				engine_unlocked_finish(fnd->funct, 0);
 			fnd->funct = e;
+			fnd->uptodate = 1;
 			}
 		nids++;
 		}
@@ -179,8 +180,7 @@
 	while((n = sk_ENGINE_find(pile->sk, e)) >= 0)
 		{
 		(void)sk_ENGINE_delete(pile->sk, n);
-		/* "touch" this ENGINE_CIPHER */
-		pile->uptodate = 1;
+		pile->uptodate = 0;
 		}
 	if(pile->funct == e)
 		{

Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2008-10-31 22:05:03 UTC (rev 343)
+++ openssl/trunk/debian/changelog	2008-10-31 22:31:47 UTC (rev 344)
@@ -2,6 +2,8 @@
 
   * Don't give the warning about security updates when upgrading
     from etch since it doesn't have any known security problems.
+  * Automaticly use engines that succesfully initialised.  Patch
+    from the 0.9.8h upstream version.  (Closes: #502177)
 
  -- Kurt Roeckx <kurt at roeckx.be>  Fri, 31 Oct 2008 22:45:14 +0100