Fix merge error.
Submitted by: jkim
This commit is contained in:
parent
00cbf6c295
commit
21c09643ff
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=281016
@ -829,7 +829,7 @@ crypto_recv(
|
||||
if (vallen == (u_int)EVP_PKEY_size(host_pkey)) {
|
||||
u_int32 *cookiebuf = malloc(
|
||||
RSA_size(host_pkey->pkey.rsa));
|
||||
if (cookiebuf == NULL) {
|
||||
if (!cookiebuf) {
|
||||
rval = XEVNT_CKY;
|
||||
break;
|
||||
}
|
||||
@ -3817,7 +3817,7 @@ crypto_setup(void)
|
||||
randfile);
|
||||
exit (-1);
|
||||
}
|
||||
get_systime(&seed);
|
||||
arc4random_buf(&seed, sizeof(l_fp));
|
||||
RAND_seed(&seed, sizeof(l_fp));
|
||||
RAND_write_file(randfile);
|
||||
#ifdef DEBUG
|
||||
@ -3840,36 +3840,6 @@ crypto_setup(void)
|
||||
memset(&pubkey, 0, sizeof(pubkey));
|
||||
memset(&tai_leap, 0, sizeof(tai_leap));
|
||||
|
||||
/*
|
||||
* Load required host key from file "ntpkey_host_<hostname>". If
|
||||
* no host key file is not found or has invalid password, life
|
||||
* as we know it ends. The host key also becomes the default
|
||||
* sign key.
|
||||
*/
|
||||
snprintf(filename, sizeof(filename), "ntpkey_host_%s", hostname);
|
||||
pinfo = crypto_key(filename, passwd, NULL);
|
||||
if (pinfo == NULL) {
|
||||
msyslog(LOG_ERR,
|
||||
"crypto_setup: random seed file not specified");
|
||||
exit (-1);
|
||||
}
|
||||
if ((bytes = RAND_load_file(rand_file, -1)) == 0) {
|
||||
msyslog(LOG_ERR,
|
||||
"crypto_setup: random seed file %s not found\n",
|
||||
rand_file);
|
||||
exit (-1);
|
||||
}
|
||||
arc4random_buf(&seed, sizeof(l_fp));
|
||||
RAND_seed(&seed, sizeof(l_fp));
|
||||
RAND_write_file(rand_file);
|
||||
OpenSSL_add_all_algorithms();
|
||||
#ifdef DEBUG
|
||||
if (debug)
|
||||
printf(
|
||||
"crypto_setup: OpenSSL version %lx random seed file %s bytes read %d\n",
|
||||
SSLeay(), rand_file, bytes);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Load required host key from file "ntpkey_host_<hostname>". If
|
||||
* no host key file is not found or has invalid password, life
|
||||
|
Loading…
Reference in New Issue
Block a user