sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Close #2083: Fix build error when building using LibreSSL. 

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@5726 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Riza Sulistyo 2018-01-17 11:15:34 +00:00
parent c4279ec635
commit 6f7a8b0fbf
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pjlib/src/pj/ssl_sock_ossl.c
View File

@ -55,8 +55,12 @@
#include <openssl/x509v3.h>
#include <openssl/rand.h>
#include <openssl/opensslconf.h>
#include <openssl/opensslv.h>
#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
#define USING_LIBRESSL (defined(LIBRESSL_VERSION_NUMBER))
#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
&& OPENSSL_VERSION_NUMBER >= 0x1000200fL
# include <openssl/obj_mac.h>
@ -114,7 +118,7 @@ static unsigned get_nid_from_cid(unsigned cid)
#endif
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
#if !USING_LIBRESSL && OPENSSL_VERSION_NUMBER >= 0x10100000L
# define OPENSSL_NO_SSL2 /* seems to be removed in 1.1.0 */
# define M_ASN1_STRING_data(x) ASN1_STRING_get0_data(x)
# define M_ASN1_STRING_length(x) ASN1_STRING_length(x)
@ -538,7 +542,7 @@ static pj_status_t init_openssl(void)
pj_assert(status == PJ_SUCCESS);
/* Init OpenSSL lib */
#if OPENSSL_VERSION_NUMBER < 0x10100000L
#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x10100000L
SSL_library_init();
SSL_load_error_strings();
#else
@ -559,7 +563,9 @@ static pj_status_t init_openssl(void)
int nid;
const char *cname;
#if OPENSSL_VERSION_NUMBER < 0x10100000L
#if (USING_LIBRESSL && LIBRESSL_VERSION_NUMBER < 0x2020100fL)\
|| OPENSSL_VERSION_NUMBER < 0x10100000L
meth = (SSL_METHOD*)SSLv23_server_method();
if (!meth)
meth = (SSL_METHOD*)TLSv1_server_method();
@ -602,7 +608,8 @@ static pj_status_t init_openssl(void)
SSL_set_session(ssl, SSL_SESSION_new());
#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
&& OPENSSL_VERSION_NUMBER >= 0x1000200fL
openssl_curves_num = SSL_get_shared_curve(ssl,-1);
if (openssl_curves_num > PJ_ARRAY_SIZE(openssl_curves))
openssl_curves_num = PJ_ARRAY_SIZE(openssl_curves);
@ -794,7 +801,8 @@ static pj_status_t create_ssl(pj_ssl_sock_t *ssock)
ssock->param.proto = PJ_SSL_SOCK_PROTO_SSL23;
/* Determine SSL method to use */
#if OPENSSL_VERSION_NUMBER < 0x10100000L
#if (USING_LIBRESSL && LIBRESSL_VERSION_NUMBER < 0x2020100fL)\
|| OPENSSL_VERSION_NUMBER < 0x10100000L
switch (ssock->param.proto) {
case PJ_SSL_SOCK_PROTO_TLS1:
ssl_method = (SSL_METHOD*)TLSv1_method();
@ -1231,7 +1239,8 @@ static pj_status_t set_cipher_list(pj_ssl_sock_t *ssock)
static pj_status_t set_curves_list(pj_ssl_sock_t *ssock)
{
#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
&& OPENSSL_VERSION_NUMBER >= 0x1000200fL
int ret;
int curves[PJ_SSL_SOCK_MAX_CURVES];
unsigned cnt;
@ -1262,7 +1271,7 @@ static pj_status_t set_curves_list(pj_ssl_sock_t *ssock)
static pj_status_t set_sigalgs(pj_ssl_sock_t *ssock)
{
#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
#if !USING_LIBRESSL && OPENSSL_VERSION_NUMBER >= 0x1000200fL
int ret;
if (ssock->param.sigalgs.ptr && ssock->param.sigalgs.slen) {

6
third_party/srtp/crypto/hash/hmac_ossl.c vendored
View File

@ -51,8 +51,10 @@
#include "err.h" /* for srtp_debug */
#include <openssl/evp.h>
#include <openssl/hmac.h>
#include <openssl/opensslv.h>
#define SHA1_DIGEST_SIZE 20
#define USING_LIBRESSL (defined(LIBRESSL_VERSION_NUMBER))
/* the debug module for authentiation */
@ -76,7 +78,7 @@ static srtp_err_status_t srtp_hmac_alloc (srtp_auth_t **a, int key_len, int out_
/* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated
using HMAC_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */
#if OPENSSL_VERSION_NUMBER < 0x10100000L
#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x10100000L
{
/* allocate memory for auth and HMAC_CTX structures */
uint8_t* pointer;
@ -121,7 +123,7 @@ static srtp_err_status_t srtp_hmac_dealloc (srtp_auth_t *a)
hmac_ctx = (HMAC_CTX*)a->state;
#if OPENSSL_VERSION_NUMBER < 0x10100000L
#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x10100000L
HMAC_CTX_cleanup(hmac_ctx);
/* zeroize entire state*/