[Pkg-openssl-changes] r695 - in openssl/branches/1.0.1/debian: . patches

[Kurt Roeckx]

Author: kroeckx
Date: 2014-10-15 17:40:50 +0000 (Wed, 15 Oct 2014)
New Revision: 695

Modified:
   openssl/branches/1.0.1/debian/changelog
   openssl/branches/1.0.1/debian/patches/dgst_hmac.patch
   openssl/branches/1.0.1/debian/patches/series
Log:
- Update dgst_hmac.patch to apply to new upstream version
- Drop rehash_pod.patch, applied upstream.


Modified: openssl/branches/1.0.1/debian/changelog
===================================================================
--- openssl/branches/1.0.1/debian/changelog	2014-10-15 17:32:21 UTC (rev 694)
+++ openssl/branches/1.0.1/debian/changelog	2014-10-15 17:40:50 UTC (rev 695)
@@ -6,6 +6,8 @@
     - Add Fallback SCSV support to mitigate CVE-2014-3566
     - Disables SSLv3 because of CVE-2014-3566
     - Fixes CVE-2014-3568
+  - Update dgst_hmac.patch to apply to new upstream version
+  - Drop rehash_pod.patch, applied upstream.
 
  -- Kurt Roeckx <kurt at roeckx.be>  Wed, 15 Oct 2014 19:06:38 +0200
 

Modified: openssl/branches/1.0.1/debian/patches/dgst_hmac.patch
===================================================================
--- openssl/branches/1.0.1/debian/patches/dgst_hmac.patch	2014-10-15 17:32:21 UTC (rev 694)
+++ openssl/branches/1.0.1/debian/patches/dgst_hmac.patch	2014-10-15 17:40:50 UTC (rev 695)
@@ -8,22 +8,22 @@
 ding though, especially considering the FIPS option, which I
 found as undocumented too.
 
-Index: openssl-1.0.0d/doc/apps/dgst.pod
+Index: openssl-1.0.1j/doc/apps/dgst.pod
 ===================================================================
---- openssl-1.0.0d.orig/doc/apps/dgst.pod	2009-04-10 16:42:27.000000000 +0000
-+++ openssl-1.0.0d/doc/apps/dgst.pod	2011-06-13 11:00:04.000000000 +0000
-@@ -12,6 +12,8 @@
+--- openssl-1.0.1j.orig/doc/apps/dgst.pod
++++ openssl-1.0.1j/doc/apps/dgst.pod
+@@ -12,6 +12,8 @@ B<openssl> B<dgst>
  [B<-d>]
  [B<-hex>]
  [B<-binary>]
 +[B<-hmac arg>]
 +[B<-non-fips-allow>]
+ [B<-r>]
  [B<-out filename>]
  [B<-sign filename>]
- [B<-keyform arg>]
-@@ -54,6 +56,14 @@
+@@ -62,6 +64,14 @@ output the digest or signature in binary
  
- output the digest or signature in binary form.
+ output the digest in the "coreutils" format used by programs like B<sha1sum>.
  
 +=item B<-hmac arg>
 +
@@ -36,11 +36,11 @@
  =item B<-out filename>
  
  filename to output to, or standard output by default.
-Index: openssl-1.0.0d/apps/dgst.c
+Index: openssl-1.0.1j/apps/dgst.c
 ===================================================================
---- openssl-1.0.0d.orig/apps/dgst.c	2010-02-12 17:07:24.000000000 +0000
-+++ openssl-1.0.0d/apps/dgst.c	2011-06-13 11:00:04.000000000 +0000
-@@ -268,6 +268,8 @@
+--- openssl-1.0.1j.orig/apps/dgst.c
++++ openssl-1.0.1j/apps/dgst.c
+@@ -273,6 +273,8 @@ int MAIN(int argc, char **argv)
  		BIO_printf(bio_err,"-d              to output debug info\n");
  		BIO_printf(bio_err,"-hex            output as hex dump\n");
  		BIO_printf(bio_err,"-binary         output in binary form\n");

Modified: openssl/branches/1.0.1/debian/patches/series
===================================================================
--- openssl/branches/1.0.1/debian/patches/series	2014-10-15 17:32:21 UTC (rev 694)
+++ openssl/branches/1.0.1/debian/patches/series	2014-10-15 17:40:50 UTC (rev 695)
@@ -9,7 +9,6 @@
 pic.patch
 valgrind.patch
 rehash-crt.patch
-rehash_pod.patch
 shared-lib-ext.patch
 stddef.patch
 version-script.patch