kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-04-26 00:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

pjproject: Backport fix for OpenSSL < 1.1.0 build failure in ssl_sock_ossl.c

Browse Source 
Backport pjsip/pjproject#4941 which fixes a build/link failure when
compiling against OpenSSL < 1.1.0 (e.g. OpenSSL 1.0.2k on CentOS 7).

Two symbols introduced in OpenSSL 1.1.x were called unconditionally
in ssl_sock_ossl.c without version guards:

- `TLS_method()` in `init_ossl_ctx()` is now guarded with
  `OPENSSL_VERSION_NUMBER < 0x10100000L`, falling back to
  `SSLv23_method()` on older OpenSSL.

- `SSL_CTX_set_ciphersuites()` is now guarded with
  `OPENSSL_VERSION_NUMBER >= 0x1010100fL` since this function
  was introduced in OpenSSL 1.1.1 and is absent in 1.0.x.

Without this fix, linking fails with:
  undefined reference to `TLS_method'
  undefined reference to `SSL_CTX_set_ciphersuites'

when building Asterisk with bundled pjproject on systems such as
CentOS 7 with OpenSSL 1.0.2k.

Resolves: #1892
This commit is contained in:
phoneben
2026-04-22 17:03:05 +03:00
parent 73daa96ad8
commit ec8a27b0ef
1 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
third-party/pjproject/patches/0070-2-17-Add-OpenSSL-version-guards.patch vendored Normal file
View File

@@ -0,0 +1,43 @@
--- a/pjlib/src/pj/ssl_sock_ossl.c
+++ b/pjlib/src/pj/ssl_sock_ossl.c
@@ -1177,7 +1177,12 @@ static pj_status_t init_ossl_ctx(pj_ssl_sock_t *ssock)
}
if (!ssl_method) {
- ssl_method = (SSL_METHOD*)TLS_method();
+#if (USING_LIBRESSL && LIBRESSL_VERSION_NUMBER < 0x2020100fL) \
+ || OPENSSL_VERSION_NUMBER < 0x10100000L
+ ssl_method = (SSL_METHOD*)SSLv23_method();
+#else
+ ssl_method = (SSL_METHOD*)TLS_method();
+#endif
#ifdef SSL_OP_NO_SSLv2
/** Check if SSLv2 is enabled */
@@ -1921,7 +1926,10 @@ static pj_status_t set_cipher_list(pj_ssl_sock_t *ssock)
enum { BUF_SIZE = 8192 };
pj_str_t cipher_list;
unsigned i, j;
- int ret, ret2 = 1;
+ int ret;
+#if !USING_BORINGSSL && OPENSSL_VERSION_NUMBER >= 0x1010100fL
+ int ret2 = 1;
+#endif
if (ssock->param.ciphers_num == 0) {
ret = SSL_CTX_set_cipher_list(ossock->ossl_ctx, PJ_SSL_SOCK_OSSL_CIPHERS);
@@ -1976,10 +1984,12 @@ static pj_status_t set_cipher_list(pj_ssl_sock_t *ssock)
* SSL_CTX_set_ciphersuites() is for TLSv1.3.
*/
ret = SSL_CTX_set_cipher_list(ossock->ossl_ctx, buf);
-#if !USING_BORINGSSL
+#if !USING_BORINGSSL && OPENSSL_VERSION_NUMBER >= 0x1010100fL
ret2 = SSL_CTX_set_ciphersuites(ossock->ossl_ctx, buf);
-#endif
if (ret < 1 && ret2 < 1) {
+#else
+ if (ret < 1) {
+#endif
PJ_LOG(4, (THIS_FILE, "Failed setting cipher list %s",
cipher_list.ptr));
pj_pool_release(tmp_pool);