ntp: Update to 4.2.8

[people/ms/ipfire-3.x.git] / ntp / patches / ntp-4.2.6p5-fipsmd5.patch

diff --git a/ntp/patches/ntp-4.2.6p5-fipsmd5.patch b/ntp/patches/ntp-4.2.6p5-fipsmd5.patch
deleted file mode 100644 (file)
index b6d8889..0000000
--- a/ntp/patches/ntp-4.2.6p5-fipsmd5.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -up ntp-4.2.6p5/libntp/a_md5encrypt.c.fipsmd5 ntp-4.2.6p5/libntp/a_md5encrypt.c
---- ntp-4.2.6p5/libntp/a_md5encrypt.c.fipsmd5  2011-12-01 03:55:17.000000000 +0100
-+++ ntp-4.2.6p5/libntp/a_md5encrypt.c  2012-10-24 16:24:04.972358878 +0200
-@@ -38,7 +38,11 @@ MD5authencrypt(
-        * was creaded.
-        */
-       INIT_SSL();
--      EVP_DigestInit(&ctx, EVP_get_digestbynid(type));
-+      if (!EVP_DigestInit(&ctx, EVP_get_digestbynid(type))) {
-+              msyslog(LOG_ERR,
-+                  "MAC encrypt: digest init failed");
-+              return (0);
-+      }
-       EVP_DigestUpdate(&ctx, key, (u_int)cache_keylen);
-       EVP_DigestUpdate(&ctx, (u_char *)pkt, (u_int)length);
-       EVP_DigestFinal(&ctx, digest, &len);
-@@ -71,7 +75,11 @@ MD5authdecrypt(
-        * was created.
-        */
-       INIT_SSL();
--      EVP_DigestInit(&ctx, EVP_get_digestbynid(type));
-+      if (!EVP_DigestInit(&ctx, EVP_get_digestbynid(type))) {
-+              msyslog(LOG_ERR,
-+                  "MAC decrypt: digest init failed");
-+              return (0);
-+      }
-       EVP_DigestUpdate(&ctx, key, (u_int)cache_keylen);
-       EVP_DigestUpdate(&ctx, (u_char *)pkt, (u_int)length);
-       EVP_DigestFinal(&ctx, digest, &len);
-@@ -101,7 +109,16 @@ addr2refid(sockaddr_u *addr)
-               return (NSRCADR(addr));
- 
-       INIT_SSL();
--      EVP_DigestInit(&ctx, EVP_get_digestbynid(NID_md5));
-+      EVP_MD_CTX_init(&ctx);
-+#ifdef EVP_MD_CTX_FLAG_NON_FIPS_ALLOW
-+      /* MD5 is not used as a crypto hash here. */
-+      EVP_MD_CTX_set_flags(&ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
-+#endif
-+      if (!EVP_DigestInit_ex(&ctx, EVP_md5(), NULL)) {
-+              msyslog(LOG_ERR,
-+                  "MD5 init failed");
-+              exit(1);
-+      }
-       EVP_DigestUpdate(&ctx, (u_char *)PSOCK_ADDR6(addr),
-           sizeof(struct in6_addr));
-       EVP_DigestFinal(&ctx, digest, &len);