diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2018-10-09 21:28:26 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2018-10-09 21:28:26 +0000 |
| commit | 1da7787f71f19e32f5123904324c67a564a950cd (patch) | |
| tree | bc9d308c86b038534ae8125a9bdc86378a792a1d /usr.sbin | |
| parent | c7d0908e1cd9b0540c1486c9cd9237b47f852636 (diff) | |
| parent | 4660a83eac83eb44ce9b8b15f76bca34646048c0 (diff) | |
Notes
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/ppp/chap_ms.c | 10 | ||||
| -rw-r--r-- | usr.sbin/uefisign/uefisign.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/ppp/chap_ms.c b/usr.sbin/ppp/chap_ms.c index 117925539259..37d143d12dc2 100644 --- a/usr.sbin/ppp/chap_ms.c +++ b/usr.sbin/ppp/chap_ms.c @@ -105,18 +105,18 @@ MakeKey(u_char *key, u_char *des_key) des_key[6] = Get7Bits(key, 42); des_key[7] = Get7Bits(key, 49); - des_set_odd_parity((des_cblock *)des_key); + DES_set_odd_parity((DES_cblock *)des_key); } static void /* IN 8 octets IN 7 octest OUT 8 octets */ DesEncrypt(u_char *clear, u_char *key, u_char *cipher) { - des_cblock des_key; - des_key_schedule key_schedule; + DES_cblock des_key; + DES_key_schedule key_schedule; MakeKey(key, des_key); - des_set_key(&des_key, key_schedule); - des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher, key_schedule, 1); + DES_set_key(&des_key, &key_schedule); + DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher, &key_schedule, 1); } static void /* IN 8 octets IN 16 octets OUT 24 octets */ diff --git a/usr.sbin/uefisign/uefisign.c b/usr.sbin/uefisign/uefisign.c index ce73d44fe528..f9fca8776dc2 100644 --- a/usr.sbin/uefisign/uefisign.c +++ b/usr.sbin/uefisign/uefisign.c @@ -390,9 +390,9 @@ main(int argc, char **argv) inpath = argv[0]; - OPENSSL_config(NULL); - ERR_load_crypto_strings(); - OpenSSL_add_all_algorithms(); + OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG | + OPENSSL_INIT_LOAD_CRYPTO_STRINGS | + OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL); error = pipe(pipefds); if (error != 0) |