a_md5encrypt.c, authreadkeys.c, ChangeLog:

  Fix for bug 1368 - typos in --without-crypto case

bk: 4af5ab51sjqvN_y8CcYK5Le0CyWz9w

diff --git a/ChangeLog b/ChangeLog
index 1d70f1fe7a06c9ffd52987e230f04e8e5b4dd0c8..ef95d0588ae7fcbe0fed82a3e46bec54c49539c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1368] typos in libntp --without-crypto case
 (4.2.5p241-RC) 2009/11/07 Released by Harlan Stenn <stenn@ntp.org>
 * html/authopt.html update from Dave Mills.
 * Remove unused file from sntp/Makefile.am's distribution list.

diff --git a/libntp/a_md5encrypt.c b/libntp/a_md5encrypt.c
index 8d03890748e2d048da31de45120a12abcb3ecd4d..2506be8c21351f6a899179be158d58a6192cc68e 100644 (file)
--- a/libntp/a_md5encrypt.c
+++ b/libntp/a_md5encrypt.c
@@ -77,6 +77,7 @@ MD5authdecrypt(
 #ifdef OPENSSL
        EVP_MD_CTX ctx;
 #else
+       MD5_CTX md5;
 #endif /* OPENSSL */
 
        /*

diff --git a/libntp/authreadkeys.c b/libntp/authreadkeys.c
index f0e0645e19f255666796bf93eb6ba89e6d77ade1..36cecd366ffb5c2d36505b7986e65ba8d329c01a 100644 (file)
--- a/libntp/authreadkeys.c
+++ b/libntp/authreadkeys.c
@@ -163,7 +163,7 @@ authreadkeys(
                            "authreadkeys: invalid type for key %d", keyno);
                        continue;
                }
-               keytype = KEY_TYPE_MD5
+               keytype = KEY_TYPE_MD5;
 #endif /* OPENSSL */
                keystr = token;