diff options
| author | roberto <roberto@FreeBSD.org> | 2009-12-15 14:58:10 +0000 |
|---|---|---|
| committer | roberto <roberto@FreeBSD.org> | 2009-12-15 14:58:10 +0000 |
| commit | 230e76b5380d386df4ba9fee065378a39a10e8b5 (patch) | |
| tree | 2928c8428ba1c1401c7dcd5d3c3c610fbb90b794 /contrib/ntp/ntpd/ntp_crypto.c | |
| parent | 2bc44b96096e82af8f7720c1883039f28c130aa0 (diff) | |
| parent | ecc42837d301a8d8e257020b30492277ad558d30 (diff) | |
| download | FreeBSD-src-230e76b5380d386df4ba9fee065378a39a10e8b5.zip FreeBSD-src-230e76b5380d386df4ba9fee065378a39a10e8b5.tar.gz | |
Merge 4.2.4p8 into contrib (r200452 & r200454).
Subversion is being difficult here so take a hammer and get it in.
MFC after: 2 weeks
Security: CVE-2009-3563
Diffstat (limited to 'contrib/ntp/ntpd/ntp_crypto.c')
| -rw-r--r-- | contrib/ntp/ntpd/ntp_crypto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/ntp/ntpd/ntp_crypto.c b/contrib/ntp/ntpd/ntp_crypto.c index b3b9b60..cce95a8 100644 --- a/contrib/ntp/ntpd/ntp_crypto.c +++ b/contrib/ntp/ntpd/ntp_crypto.c @@ -3618,7 +3618,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); @@ -3946,7 +3946,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); |
