[Pkg-openssl-changes] r493 - in openssl/trunk/debian: . patches

[Kurt Roeckx]

Author: kroeckx
Date: 2011-04-13 20:39:48 +0000 (Wed, 13 Apr 2011)
New Revision: 493

Added:
   openssl/trunk/debian/patches/c_rehash-compat.patch
Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/patches/series
Log:
Make c_rehash also generate the old subject hash.  Gnutls applications
seem to require it.  (Closes: #611102)


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2011-04-06 16:53:47 UTC (rev 492)
+++ openssl/trunk/debian/changelog	2011-04-13 20:39:48 UTC (rev 493)
@@ -1,3 +1,10 @@
+openssl (1.0.0d-2) unstable; urgency=low
+
+  * Make c_rehash also generate the old subject hash.  Gnutls applications
+    seem to require it.  (Closes: #611102)
+
+ -- Kurt Roeckx <kurt at roeckx.be>  Wed, 13 Apr 2011 22:36:49 +0200
+
 openssl (1.0.0d-1) unstable; urgency=low
 
   * New upstream version

Added: openssl/trunk/debian/patches/c_rehash-compat.patch
===================================================================
--- openssl/trunk/debian/patches/c_rehash-compat.patch	                        (rev 0)
+++ openssl/trunk/debian/patches/c_rehash-compat.patch	2011-04-13 20:39:48 UTC (rev 493)
@@ -0,0 +1,46 @@
+From 83f318d68bbdab1ca898c94576a838cc97df4700 Mon Sep 17 00:00:00 2001
+From: Ludwig Nussel <ludwig.nussel at suse.de>
+Date: Wed, 21 Apr 2010 15:52:10 +0200
+Subject: [PATCH] also create old hash for compatibility
+
+---
+ tools/c_rehash.in |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/tools/c_rehash.in b/tools/c_rehash.in
+index bfc4a69..f8d0ce1 100644
+--- a/tools/c_rehash.in
++++ b/tools/c_rehash.in
+@@ -83,6 +83,7 @@ sub hash_dir {
+ 			next;
+ 		}
+ 		link_hash_cert($fname) if($cert);
++		link_hash_cert_old($fname) if($cert);
+ 		link_hash_crl($fname) if($crl);
+ 	}
+ }
+@@ -116,8 +117,9 @@ sub check_file {
+ 
+ sub link_hash_cert {
+ 		my $fname = $_[0];
++		my $hashopt = $_[1] || '-subject_hash';
+ 		$fname =~ s/'/'\\''/g;
+-		my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in "$fname"`;
++		my ($hash, $fprint) = `"$openssl" x509 $hashopt -fingerprint -noout -in "$fname"`;
+ 		chomp $hash;
+ 		chomp $fprint;
+ 		$fprint =~ s/^.*=//;
+@@ -147,6 +149,10 @@ sub link_hash_cert {
+ 		$hashlist{$hash} = $fprint;
+ }
+ 
++sub link_hash_cert_old {
++		link_hash_cert($_[0], '-subject_hash_old');
++}
++
+ # Same as above except for a CRL. CRL links are of the form <hash>.r<n>
+ 
+ sub link_hash_crl {
+-- 
+1.6.4.2
+

Modified: openssl/trunk/debian/patches/series
===================================================================
--- openssl/trunk/debian/patches/series	2011-04-06 16:53:47 UTC (rev 492)
+++ openssl/trunk/debian/patches/series	2011-04-13 20:39:48 UTC (rev 493)
@@ -17,3 +17,4 @@
 stddef.patch
 version-script.patch
 gnu_source.patch
+c_rehash-compat.patch