Merge pull request #10994 from BKPepe/libseccomp
[feed/packages.git] / libs / libssh / patches / 010-openssl-11-deprecated.patch
1 --- a/src/dh.c
2 +++ b/src/dh.c
3 @@ -131,11 +131,15 @@ int ssh_get_random(void *where, int len, int strong){
4
5 return 1;
6 #elif defined HAVE_LIBCRYPTO
7 +#if OPENSSL_VERSION_NUMBER < 0x10100000L
8 if (strong) {
9 return RAND_bytes(where,len);
10 } else {
11 return RAND_pseudo_bytes(where,len);
12 }
13 +#else
14 + return RAND_bytes(where,len);
15 +#endif
16 #endif
17
18 /* never reached */
19 @@ -198,7 +202,9 @@ int ssh_crypto_init(void) {
20 }
21 bignum_bin2bn(p_group14_value, P_GROUP14_LEN, p_group14);
22
23 +#if OPENSSL_VERSION_NUMBER < 0x10100000L
24 OpenSSL_add_all_algorithms();
25 +#endif
26
27 #endif
28
29 @@ -219,8 +225,10 @@ void ssh_crypto_finalize(void) {
30 #ifdef HAVE_LIBGCRYPT
31 gcry_control(GCRYCTL_TERM_SECMEM);
32 #elif defined HAVE_LIBCRYPTO
33 +#if OPENSSL_VERSION_NUMBER < 0x10100000L
34 EVP_cleanup();
35 CRYPTO_cleanup_all_ex_data();
36 +#endif
37 #endif
38 ssh_crypto_initialized=0;
39 }