mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-23 04:23:08 +00:00
Import patches from asterisk project.
MFH: 2019Q4
This commit is contained in:
Guido Falsi
parent
44710045ba
commit
b842667be5
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=514163
@ -2,7 +2,7 @@
|
||||
|
||||
PORTNAME= pjsip
|
||||
PORTVERSION= 2.9
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/
|
||||
DISTNAME= pjproject-${DISTVERSION}
|
||||
|
||||
60
net/pjsip/files/patch-0030
Normal file
60
net/pjsip/files/patch-0030
Normal file
@ -0,0 +1,60 @@
|
||||
From 8d0652d4a02c7b8da58b1b98421cfda57056184d Mon Sep 17 00:00:00 2001
|
||||
From: George Joseph <gjoseph@digium.com>
|
||||
Date: Tue, 24 Sep 2019 06:41:16 -0600
|
||||
Subject: [PATCH 30/33] Revert "Misc (re #2147): Fixed warnings in SSL socket:
|
||||
redefinition of typedef 'pj_ssl_sock_t' and unused 'get_pem'."
|
||||
|
||||
This reverts commit 688a9b0de685328f62b2df86304b44c21e4460ae.
|
||||
---
|
||||
pjlib/src/pj/ssl_sock_imp_common.h | 4 ++--
|
||||
pjlib/src/pj/ssl_sock_ossl.c | 5 +----
|
||||
2 files changed, 3 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/pjlib/src/pj/ssl_sock_imp_common.h b/pjlib/src/pj/ssl_sock_imp_common.h
|
||||
index 09f259ef7..4edbb3b82 100644
|
||||
--- pjlib/src/pj/ssl_sock_imp_common.h
|
||||
+++ pjlib/src/pj/ssl_sock_imp_common.h
|
||||
@@ -93,7 +93,7 @@ typedef struct circ_buf_t {
|
||||
/*
|
||||
* Secure socket structure definition.
|
||||
*/
|
||||
-struct pj_ssl_sock_t
|
||||
+typedef struct pj_ssl_sock_t
|
||||
{
|
||||
pj_pool_t *pool;
|
||||
pj_ssl_sock_t *parent;
|
||||
@@ -139,7 +139,7 @@ struct pj_ssl_sock_t
|
||||
|
||||
circ_buf_t circ_buf_output;
|
||||
pj_lock_t *circ_buf_output_mutex;
|
||||
-};
|
||||
+} pj_ssl_sock_t;
|
||||
|
||||
|
||||
/*
|
||||
diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c
|
||||
index b4ac5c15f..debb105b1 100644
|
||||
--- pjlib/src/pj/ssl_sock_ossl.c
|
||||
+++ pjlib/src/pj/ssl_sock_ossl.c
|
||||
@@ -37,6 +37,7 @@
|
||||
#if defined(PJ_HAS_SSL_SOCK) && PJ_HAS_SSL_SOCK != 0 && \
|
||||
(PJ_SSL_SOCK_IMP == PJ_SSL_SOCK_IMP_OPENSSL)
|
||||
|
||||
+#include "ssl_sock_imp_common.h"
|
||||
#include "ssl_sock_imp_common.c"
|
||||
|
||||
#define THIS_FILE "ssl_sock_ossl.c"
|
||||
@@ -1575,10 +1576,6 @@ static void ssl_update_remote_cert_chain_info(pj_pool_t *pool,
|
||||
{
|
||||
int i;
|
||||
|
||||
- /* For now, get_pem has to be PJ_TRUE */
|
||||
- pj_assert(get_pem);
|
||||
- PJ_UNUSED_ARG(get_pem);
|
||||
-
|
||||
ci->raw_chain.cert_raw = (pj_str_t *)pj_pool_calloc(pool,
|
||||
sk_X509_num(chain),
|
||||
sizeof(pj_str_t));
|
||||
--
|
||||
2.21.0
|
||||
|
||||
84
net/pjsip/files/patch-0031
Normal file
84
net/pjsip/files/patch-0031
Normal file
@ -0,0 +1,84 @@
|
||||
From 616a13933f33a6d74f84d85b5bfb858279a09e2d Mon Sep 17 00:00:00 2001
|
||||
From: George Joseph <gjoseph@digium.com>
|
||||
Date: Tue, 24 Sep 2019 06:42:04 -0600
|
||||
Subject: [PATCH 31/33] Revert "Fixed #2204: Add OpenSSL remote certificate
|
||||
chain info"
|
||||
|
||||
This reverts commit f71d60c866c4572a7c8398fe982416771fc6a7f5.
|
||||
---
|
||||
pjlib/src/pj/ssl_sock_ossl.c | 45 ------------------------------------
|
||||
1 file changed, 45 deletions(-)
|
||||
|
||||
diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c
|
||||
index debb105b1..109c5c1e2 100644
|
||||
--- pjlib/src/pj/ssl_sock_ossl.c
|
||||
+++ pjlib/src/pj/ssl_sock_ossl.c
|
||||
@@ -1566,41 +1566,6 @@ static void get_cert_info(pj_pool_t *pool, pj_ssl_cert_info *ci, X509 *x,
|
||||
}
|
||||
}
|
||||
|
||||
-/* Update remote certificates chain info. This function should be
|
||||
- * called after handshake or renegotiation successfully completed.
|
||||
- */
|
||||
-static void ssl_update_remote_cert_chain_info(pj_pool_t *pool,
|
||||
- pj_ssl_cert_info *ci,
|
||||
- STACK_OF(X509) *chain,
|
||||
- pj_bool_t get_pem)
|
||||
-{
|
||||
- int i;
|
||||
-
|
||||
- ci->raw_chain.cert_raw = (pj_str_t *)pj_pool_calloc(pool,
|
||||
- sk_X509_num(chain),
|
||||
- sizeof(pj_str_t));
|
||||
- ci->raw_chain.cnt = sk_X509_num(chain);
|
||||
-
|
||||
- for (i = 0; i < sk_X509_num(chain); i++) {
|
||||
- BIO *bio;
|
||||
- BUF_MEM *ptr;
|
||||
- X509 *x = sk_X509_value(chain, i);
|
||||
-
|
||||
- bio = BIO_new(BIO_s_mem());
|
||||
-
|
||||
- if (!PEM_write_bio_X509(bio, x)) {
|
||||
- PJ_LOG(3, (THIS_FILE, "Error retrieving raw certificate info"));
|
||||
- ci->raw_chain.cert_raw[i].ptr = NULL;
|
||||
- ci->raw_chain.cert_raw[i].slen = 0;
|
||||
- } else {
|
||||
- BIO_write(bio, "\0", 1);
|
||||
- BIO_get_mem_ptr(bio, &ptr);
|
||||
- pj_strdup2(pool, &ci->raw_chain.cert_raw[i], ptr->data );
|
||||
- }
|
||||
-
|
||||
- BIO_free(bio);
|
||||
- }
|
||||
-}
|
||||
|
||||
/* Update local & remote certificates info. This function should be
|
||||
* called after handshake or renegotiation successfully completed.
|
||||
@@ -1609,7 +1574,6 @@ static void ssl_update_certs_info(pj_ssl_sock_t *ssock)
|
||||
{
|
||||
ossl_sock_t *ossock = (ossl_sock_t *)ssock;
|
||||
X509 *x;
|
||||
- STACK_OF(X509) *chain;
|
||||
|
||||
pj_assert(ssock->ssl_state == SSL_STATE_ESTABLISHED);
|
||||
|
||||
@@ -1631,15 +1595,6 @@ static void ssl_update_certs_info(pj_ssl_sock_t *ssock)
|
||||
} else {
|
||||
pj_bzero(&ssock->remote_cert_info, sizeof(pj_ssl_cert_info));
|
||||
}
|
||||
-
|
||||
- chain = SSL_get_peer_cert_chain(ossock->ossl_ssl);
|
||||
- if (chain) {
|
||||
- ssl_update_remote_cert_chain_info(ssock->pool,
|
||||
- &ssock->remote_cert_info,
|
||||
- chain, PJ_TRUE);
|
||||
- } else {
|
||||
- ssock->remote_cert_info.raw_chain.cnt = 0;
|
||||
- }
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
64
net/pjsip/files/patch-0032
Normal file
64
net/pjsip/files/patch-0032
Normal file
@ -0,0 +1,64 @@
|
||||
From 17cd744e19cd332a219a512770fa6e18453044ba Mon Sep 17 00:00:00 2001
|
||||
From: George Joseph <gjoseph@digium.com>
|
||||
Date: Tue, 24 Sep 2019 06:45:25 -0600
|
||||
Subject: [PATCH 32/33] Revert "Re #2147 (misc): Fix failed pjsip-test
|
||||
(transport_loop_test) caused by r6002."
|
||||
|
||||
This reverts commit 342148f5bcf3a6b0029ce834b8567c2cd691b15b.
|
||||
---
|
||||
pjsip/src/pjsip/sip_transport.c | 12 +++++-------
|
||||
pjsip/src/pjsip/sip_transport_loop.c | 2 +-
|
||||
pjsip/src/test/transport_loop_test.c | 1 -
|
||||
3 files changed, 6 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c
|
||||
index 65ac823d4..d63823a98 100644
|
||||
--- pjsip/src/pjsip/sip_transport.c
|
||||
+++ pjsip/src/pjsip/sip_transport.c
|
||||
@@ -1222,13 +1222,11 @@ PJ_DEF(pj_status_t) pjsip_transport_register( pjsip_tpmgr *mgr,
|
||||
|
||||
pj_lock_release(mgr->lock);
|
||||
|
||||
- TRACE_((THIS_FILE, "Transport %s registered: type=%s, remote=%s:%d",
|
||||
- tp->obj_name,
|
||||
- pjsip_transport_get_type_name(tp->key.type),
|
||||
- pj_sockaddr_has_addr(&tp->key.rem_addr)?
|
||||
- addr_string(&tp->key.rem_addr):"",
|
||||
- pj_sockaddr_has_addr(&tp->key.rem_addr)?
|
||||
- pj_sockaddr_get_port(&tp->key.rem_addr):0));
|
||||
+ TRACE_((THIS_FILE,"Transport %s registered: type=%s, remote=%s:%d",
|
||||
+ tp->obj_name,
|
||||
+ pjsip_transport_get_type_name(tp->key.type),
|
||||
+ addr_string(&tp->key.rem_addr),
|
||||
+ pj_sockaddr_get_port(&tp->key.rem_addr)));
|
||||
|
||||
return PJ_SUCCESS;
|
||||
}
|
||||
diff --git a/pjsip/src/pjsip/sip_transport_loop.c b/pjsip/src/pjsip/sip_transport_loop.c
|
||||
index 37e20e69b..24e1a5f69 100644
|
||||
--- pjsip/src/pjsip/sip_transport_loop.c
|
||||
+++ pjsip/src/pjsip/sip_transport_loop.c
|
||||
@@ -376,7 +376,7 @@ PJ_DEF(pj_status_t) pjsip_loop_start( pjsip_endpoint *endpt,
|
||||
if (status != PJ_SUCCESS)
|
||||
goto on_error;
|
||||
loop->base.key.type = PJSIP_TRANSPORT_LOOP_DGRAM;
|
||||
- //loop->base.key.rem_addr.addr.sa_family = pj_AF_INET();
|
||||
+ loop->base.key.rem_addr.addr.sa_family = pj_AF_INET();
|
||||
loop->base.type_name = "LOOP-DGRAM";
|
||||
loop->base.info = "LOOP-DGRAM";
|
||||
loop->base.flag = PJSIP_TRANSPORT_DATAGRAM;
|
||||
diff --git a/pjsip/src/test/transport_loop_test.c b/pjsip/src/test/transport_loop_test.c
|
||||
index 5f2f03904..efa2ea116 100644
|
||||
--- pjsip/src/test/transport_loop_test.c
|
||||
+++ pjsip/src/test/transport_loop_test.c
|
||||
@@ -36,7 +36,6 @@ static int datagram_loop_test()
|
||||
|
||||
PJ_LOG(3,(THIS_FILE, "testing datagram loop transport"));
|
||||
|
||||
- pj_sockaddr_in_init(&addr, NULL, 0);
|
||||
/* Test acquire transport. */
|
||||
status = pjsip_endpt_acquire_transport( endpt, PJSIP_TRANSPORT_LOOP_DGRAM,
|
||||
&addr, sizeof(addr), NULL, &loop);
|
||||
--
|
||||
2.21.0
|
||||
|
||||
1094
net/pjsip/files/patch-0033
Normal file
1094
net/pjsip/files/patch-0033
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user