[BUG 1113] Fixed build errors with recent versions of openSSL.

bk: 4964dfc2hAxxwYDssQipyKXQyuk8NQ

diff --git a/ChangeLog b/ChangeLog
index 6992b8268205b6532062af3ae9b7b2715a5344af..d1475c82447114dc58d219d7dfd568c9de187cbe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [BUG 1113] Fixed build errors with recent versions of openSSL. 
 ---
 (4.2.4p5) 2008/08/17 Released by Harlan Stenn <stenn@ntp.org>
 

diff --git a/ntpd/ntp_crypto.c b/ntpd/ntp_crypto.c
index 84adbdda1e567c108f83a775e3c6cb5054f88c32..56d78f205d00eb8fb6fc8fdf2c253e427f0dcf90 100644 (file)
--- a/ntpd/ntp_crypto.c
+++ b/ntpd/ntp_crypto.c
@@ -3613,7 +3613,7 @@ crypto_key(
        if (debug)
                printf("crypto_key: %s\n", statstr);
        if (debug > 1) {
-               if (EVP_MD_type(pkey) == EVP_PKEY_DSA)
+               if (pkey->type == EVP_PKEY_DSA)
                        DSA_print_fp(stdout, pkey->pkey.dsa, 0);
                else
                        RSA_print_fp(stdout, pkey->pkey.rsa, 0);
@@ -3941,7 +3941,7 @@ crypto_setup(void)
        sign_pkey = pkey;
        sstamp = fstamp;
        hostval.fstamp = htonl(fstamp);
-       if (EVP_MD_type(host_pkey) != EVP_PKEY_RSA) {
+       if (host_pkey->type != EVP_PKEY_RSA) {
                msyslog(LOG_ERR,
                    "crypto_setup: host key is not RSA key type");
                exit (-1);