Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apple SSL backend using Network framework #2482

Merged
merged 11 commits into from Sep 29, 2020
Merged

Apple SSL backend using Network framework #2482

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1652409
Apple SSL sock using Network framework
sauwming Jun 25, 2020
44d70ee
Merge branch 'master' into ssl-apple
sauwming Jun 30, 2020
2b8402e
Revert configure script
sauwming Jul 8, 2020
587272d
Fix build failure on non-Darwin OS
sauwming Jul 8, 2020
acd05e4
Fix build failure on non-Darwin OS (2)
sauwming Jul 8, 2020
d6aeaab
modify return values based on review comments
sauwming Jul 20, 2020
4f50648
modify based on PR review
sauwming Jul 21, 2020
86b32a1
Merge branch 'master' into ssl-apple
sauwming Jul 22, 2020
d87abd2
Use event manager
sauwming Jul 22, 2020
7bd1312
Merge branch 'master' into ssl-apple
sauwming Jul 22, 2020
3ff0cd6
revert pjlib-test
sauwming Jul 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions aconfigure
View file
Open in desktop
Expand Up @@ -5952,6 +5952,12 @@ case $target in
ac_os_objs="$ac_os_objs sock_qos_bsd.o"
;;
esac
# SSL
case $target in
*darwin*)
ac_os_objs="$ac_os_objs ssl_sock_apple.o"
;;
esac
# UUID
case $target in
*android*)
Expand Down
6 changes: 6 additions & 0 deletions aconfigure.ac
View file
Open in desktop
Expand Up @@ -487,6 +487,12 @@ case $target in
ac_os_objs="$ac_os_objs sock_qos_bsd.o"
;;
esac
# SSL
case $target in
*darwin*)
ac_os_objs="$ac_os_objs ssl_sock_apple.o"
;;
esac
# UUID
case $target in
*android*)
Expand Down
6 changes: 5 additions & 1 deletion pjlib/include/pj/config.h
View file
Open in desktop
Expand Up @@ -986,7 +986,11 @@
#define PJ_SSL_SOCK_IMP_NONE 0 /**< Disable SSL socket. */
#define PJ_SSL_SOCK_IMP_OPENSSL 1 /**< Using OpenSSL. */
#define PJ_SSL_SOCK_IMP_GNUTLS 2 /**< Using GnuTLS. */

#define PJ_SSL_SOCK_IMP_DARWIN 3 /**< Using Apple's Secure
Transport (deprecated in
MacOS 10.15 & iOS 13.0)*/
#define PJ_SSL_SOCK_IMP_APPLE 4 /**< Using Apple's Network
framework. */

/**
* Select which SSL socket implementation to use. Currently pjlib supports
Expand Down