Merge lp:~rhansen/ubuntu/trusty/dropbear/bug1409798 into lp:ubuntu/trusty/dropbear

[Richard Hansen]

SRU to enable hmac-sha2-256 and hmac-sha2-512 MAC algorithms (LP: #1409798)

[Brian Murray (brian-murray)]

This looks good thanks for working on it!

review: Approve

Unmerged revisions

25. By Richard Hansen on 2015-02-08

Enable hmac-sha2-256 and hmac-sha2-512 MAC algorithms (LP: #1409798)

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-19 16:26:26 +0000
+++ debian/changelog	2015-02-08 09:05:09 +0000
@@ -1,3 +1,9 @@
+dropbear (2013.60-1ubuntu2.1) trusty; urgency=medium
+
+  * Enable hmac-sha2-256 and hmac-sha2-512 MAC algorithms (LP: #1409798)
+
+ -- Richard Hansen <[e-mail]>  Wed, 04 Feb 2015 16:11:03 -0600
+
 dropbear (2013.60-1ubuntu2) trusty; urgency=medium
 
   * Fix initramfs hooks so that the network configuration happens before

=== added file 'debian/diff/0004-options.h-enable-hmac-sha2-256-and-512.diff'
--- debian/diff/0004-options.h-enable-hmac-sha2-256-and-512.diff	1970-01-01 00:00:00 +0000
+++ debian/diff/0004-options.h-enable-hmac-sha2-256-and-512.diff	2015-02-08 09:05:09 +0000
@@ -0,0 +1,15 @@
+diff --git a/options.h b/options.h
+index 7d06322..24dec99 100644
+--- a/options.h
++++ b/options.h
+@@ -120,8 +120,8 @@ much traffic. */
+  * which are not the standard form. */
+ #define DROPBEAR_SHA1_HMAC
+ #define DROPBEAR_SHA1_96_HMAC
+-/*#define DROPBEAR_SHA2_256_HMAC*/
+-/*#define DROPBEAR_SHA2_512_HMAC*/
++#define DROPBEAR_SHA2_256_HMAC
++#define DROPBEAR_SHA2_512_HMAC
+ #define DROPBEAR_MD5_HMAC
+ 
+ /* You can also disable integrity. Don't bother disabling this if you're