diff options
Diffstat (limited to 'pjlib/src/pj')
| -rw-r--r-- | pjlib/src/pj/ssl_sock_ossl.c | 9 | ||||
| -rw-r--r-- | pjlib/src/pj/ssl_sock_symbian.cpp | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c index 76c321aa..9c016a3a 100644 --- a/pjlib/src/pj/ssl_sock_ossl.c +++ b/pjlib/src/pj/ssl_sock_ossl.c @@ -248,7 +248,7 @@ static pj_str_t ssl_strerror(pj_status_t status, errstr.ptr = buf; errstr.slen = pj_ansi_snprintf(buf, bufsize, - "Unknown OpenSSL error %d", + "Unknown OpenSSL error %ul", ssl_err); return errstr; @@ -267,9 +267,11 @@ static unsigned openssl_cipher_num; /* Initialize OpenSSL */ static pj_status_t init_openssl(void) { - if (++openssl_init_count != 1) + if (openssl_init_count) return PJ_SUCCESS; + openssl_init_count = 1; + /* Register error subsystem */ if (!openssl_reg_strerr) { pj_status_t status; @@ -334,8 +336,7 @@ static pj_status_t init_openssl(void) /* Shutdown OpenSSL */ static void shutdown_openssl(void) { - if (--openssl_init_count != 0) - return; + PJ_UNUSED_ARG(openssl_init_count); } diff --git a/pjlib/src/pj/ssl_sock_symbian.cpp b/pjlib/src/pj/ssl_sock_symbian.cpp index 0619fd98..18dfd7c0 100644 --- a/pjlib/src/pj/ssl_sock_symbian.cpp +++ b/pjlib/src/pj/ssl_sock_symbian.cpp @@ -447,7 +447,8 @@ PJ_DEF(pj_status_t) pj_ssl_cipher_get_availables (pj_ssl_cipher ciphers[], if (ciphers_num_ > PJ_ARRAY_SIZE(ciphers_)) ciphers_num_ = PJ_ARRAY_SIZE(ciphers_); for (i = 0; i < ciphers_num_; ++i) - ciphers_[i] = (pj_ssl_cipher)ciphers_buf[i*2]; + ciphers_[i] = (pj_ssl_cipher)(ciphers_buf[i*2]*10 + + ciphers_buf[i*2+1]); } delete secure_sock; |