From: Martin Burnicki <burnicki@ntp.org>
Date: Wed, 7 Jan 2009 17:00:50 +0000 (+0100)
Subject: [BUG 1113] Fixed build errors with recent versions of openSSL.
X-Git-Tag: NTP_4_2_4P5~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2abf4580849414dec584c80730f95e6456b14ba;p=thirdparty%2Fntp.git

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

bk: 4964dfc2hAxxwYDssQipyKXQyuk8NQ
---

diff --git a/ChangeLog b/ChangeLog
index 6992b8268..d1475c824 100644
--- 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 84adbdda1..56d78f205 100644
--- 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);