[ntp] allow symmetric keys up to 32 bytes again

Miroslav Lichvar mlichvar at fedoraproject.org
Thu Feb 26 14:51:37 UTC 2015


commit 1c6f1f773f14df8fe42df0fbc3be4e01e2cc19fd
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Thu Feb 26 15:36:52 2015 +0100

    allow symmetric keys up to 32 bytes again

 ntp-4.2.6p5-keylen.patch | 12 ++++++++++++
 ntp.spec                 |  3 +++
 2 files changed, 15 insertions(+)
---
diff --git a/ntp-4.2.6p5-keylen.patch b/ntp-4.2.6p5-keylen.patch
new file mode 100644
index 0000000..5dc50b8
--- /dev/null
+++ b/ntp-4.2.6p5-keylen.patch
@@ -0,0 +1,12 @@
+diff -up ntp-4.2.6p5/libntp/authreadkeys.c.keylen ntp-4.2.6p5/libntp/authreadkeys.c
+--- ntp-4.2.6p5/libntp/authreadkeys.c.keylen	2015-02-09 12:33:15.549485698 +0100
++++ ntp-4.2.6p5/libntp/authreadkeys.c	2015-02-09 13:03:44.938842731 +0100
+@@ -74,7 +74,7 @@ authreadkeys(
+ 	keyid_t	keyno;
+ 	int	keytype;
+ 	char	buf[512];		/* lots of room for line */
+-	u_char	keystr[20];
++	u_char	keystr[32];
+ 	int	len;
+ 
+ 	/*
diff --git a/ntp.spec b/ntp.spec
index 7534e52..6c943c7 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -113,6 +113,8 @@ Patch30: ntp-4.2.6p5-sourceport.patch
 Patch31: ntp-4.2.6p5-mreadvar.patch
 # ntpbz #730
 Patch32: ntp-4.2.6p5-rsaexp.patch
+# ntpbz #2537
+Patch33: ntp-4.2.6p5-keylen.patch
 
 # handle unknown clock types
 Patch50: ntpstat-0.2-clksrc.patch
@@ -238,6 +240,7 @@ This package contains NTP documentation in HTML format.
 %patch30 -p1 -b .sourceport
 %patch31 -p1 -b .mreadvar
 %patch32 -p1 -b .rsaexp
+%patch33 -p1 -b .keylen
 
 # ntpstat patches
 %patch50 -p1 -b .clksrc


More information about the scm-commits mailing list