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

Proposed by Richard Hansen on 2015-02-08
Status: Approved
Approved by: Brian Murray on 2015-02-10
Approved revision: 26
Proposed branch: lp:~rhansen/ubuntu/utopic/dropbear/bug1409798
Merge into: lp:ubuntu/utopic/dropbear
Diff against target: 33 lines (+21/-0)
2 files modified
debian/changelog (+6/-0)
debian/diff/0003-options.h-enable-hmac-sha2-256-and-512.diff (+15/-0)
To merge this branch: bzr merge lp:~rhansen/ubuntu/utopic/dropbear/bug1409798
Reviewer Review Type Date Requested Status
Brian Murray 2015-02-08 Approve on 2015-02-10
Review via email: mp+249009@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Brian Murray (brian-murray) wrote :

This looks good thanks!

review: Approve

Unmerged revisions

26. By Richard Hansen on 2015-02-08

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-08-12 11:04:21 +0000
3+++ debian/changelog 2015-02-08 08:57:25 +0000
4@@ -1,3 +1,9 @@
5+dropbear (2014.65-1ubuntu1.1) utopic; urgency=medium
6+
7+ * Enable hmac-sha2-256 and hmac-sha2-512 MAC algorithms (LP: #1409798)
8+
9+ -- Richard Hansen <ubuntu-a7x@scientician.org> Wed, 04 Feb 2015 16:11:03 -0600
10+
11 dropbear (2014.65-1ubuntu1) utopic; urgency=low
12
13 * Merge from Debian unstable. (LP: #1355670) Remaining changes:
14
15=== added file 'debian/diff/0003-options.h-enable-hmac-sha2-256-and-512.diff'
16--- debian/diff/0003-options.h-enable-hmac-sha2-256-and-512.diff 1970-01-01 00:00:00 +0000
17+++ debian/diff/0003-options.h-enable-hmac-sha2-256-and-512.diff 2015-02-08 08:57:25 +0000
18@@ -0,0 +1,15 @@
19+diff --git a/options.h b/options.h
20+index 56b6370..c96709c 100644
21+--- a/options.h
22++++ b/options.h
23+@@ -123,8 +123,8 @@ much traffic. */
24+ * which are not the standard form. */
25+ #define DROPBEAR_SHA1_HMAC
26+ #define DROPBEAR_SHA1_96_HMAC
27+-/*#define DROPBEAR_SHA2_256_HMAC*/
28+-/*#define DROPBEAR_SHA2_512_HMAC*/
29++#define DROPBEAR_SHA2_256_HMAC
30++#define DROPBEAR_SHA2_512_HMAC
31+ #define DROPBEAR_MD5_HMAC
32+
33+ /* You can also disable integrity. Don't bother disabling this if you're

Subscribers

People subscribed via source and target branches