From 023fa0f9e88558bf9b099b7aed9334b676fc89d8 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Fri, 16 Jan 2015 21:46:09 +0000 Subject: Add support for the ca_list_path option for PJSIP transports. This allows for a path to be specified that has a collection of CA certificates in it. ASTERISK-24575 #close Reported by cloos Patches: pj-ca-path-trunk.diff uploaded by cloos (License #5956) Review: https://reviewboard.asterisk.org/r/4344 ........ Merged revisions 430709 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@430713 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/autoconfig.h.in | 9 ++++----- include/asterisk/res_pjsip.h | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index f9046b475..2832c0027 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -584,6 +584,10 @@ /* Define if your system has the PJSIP_REPLACE_MEDIA_STREAM headers. */ #undef HAVE_PJSIP_REPLACE_MEDIA_STREAM +/* Define to 1 if PJPROJECT has the pj_ssl_cert_load_from_files2 support + feature. */ +#undef HAVE_PJ_SSL_CERT_LOAD_FROM_FILES2 + /* Define to 1 if PJPROJECT has the PJSIP Transaction Group Lock Support feature. */ #undef HAVE_PJ_TRANSACTION_GRP_LOCK @@ -1295,11 +1299,6 @@ /* Define to 1 if running on Darwin. */ #undef _DARWIN_UNLIMITED_SELECT -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h index 3962b76f0..43194fe2f 100644 --- a/include/asterisk/res_pjsip.h +++ b/include/asterisk/res_pjsip.h @@ -91,6 +91,8 @@ struct ast_sip_transport { AST_DECLARE_STRING_FIELDS( /*! Certificate of authority list file */ AST_STRING_FIELD(ca_list_file); + /*! Certificate of authority list path */ + AST_STRING_FIELD(ca_list_path); /*! Public certificate file */ AST_STRING_FIELD(cert_file); /*! Optional private key of the certificate file */ -- cgit v1.2.3