diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2011-10-24 09:28:13 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2011-10-24 09:28:13 +0000 |
| commit | 2068f13bc42cf3a47374aa2765f82724a5782028 (patch) | |
| tree | 29fbeaa152ab51e59b650c0d7cd83a38111e1ecc /pjlib/src/pj/ssl_sock_ossl.c | |
| parent | 1c72a42676e7aa0c2ae0734549050f738f3bdf02 (diff) | |
Re #1395: Backport of PJSIP 1.x branch into PJSIP 2.0 trunk
* Backport of r3557:r3832
TODO: ticket #1268 (Option for automatic/manual sending of RTCP SDES/BYE for the stream) for video stream.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3841 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/src/pj/ssl_sock_ossl.c')
| -rw-r--r-- | pjlib/src/pj/ssl_sock_ossl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c index 56a6023b..6ce44ad1 100644 --- a/pjlib/src/pj/ssl_sock_ossl.c +++ b/pjlib/src/pj/ssl_sock_ossl.c @@ -310,8 +310,10 @@ static pj_status_t init_openssl(void) meth = (SSL_METHOD*)TLSv1_server_method(); if (!meth) meth = (SSL_METHOD*)SSLv3_server_method(); +#ifndef OPENSSL_NO_SSL2 if (!meth) meth = (SSL_METHOD*)SSLv2_server_method(); +#endif pj_assert(meth); ctx=SSL_CTX_new(meth); @@ -488,9 +490,11 @@ static pj_status_t create_ssl(pj_ssl_sock_t *ssock) case PJ_SSL_SOCK_PROTO_TLS1: ssl_method = (SSL_METHOD*)TLSv1_method(); break; +#ifndef OPENSSL_NO_SSL2 case PJ_SSL_SOCK_PROTO_SSL2: ssl_method = (SSL_METHOD*)SSLv2_method(); break; +#endif case PJ_SSL_SOCK_PROTO_SSL3: ssl_method = (SSL_METHOD*)SSLv3_method(); break; |