@@ -785,7 +785,7 @@ static pj_status_t init_openssl(void)
785785#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC ) \
786786 && OPENSSL_VERSION_NUMBER >= 0x1000200fL
787787#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
788- ssl_curves_num = EC_get_builtin_curves (NULL , 0 );
788+ ssl_curves_num = ( unsigned ) EC_get_builtin_curves (NULL , 0 );
789789#else
790790
791791#if USING_BORINGSSL
@@ -1076,7 +1076,13 @@ static int xname_cmp(const X509_NAME **a, const X509_NAME **b) {
10761076#if !defined(OPENSSL_NO_DH )
10771077
10781078static void set_option (const pj_ssl_sock_t * ssock , SSL_CTX * ctx ) {
1079- unsigned long options = SSL_OP_CIPHER_SERVER_PREFERENCE |
1079+ #if OPENSSL_VERSION_NUMBER >= 0x30000000L && PJ_HAS_INT64
1080+ uint64_t options ;
1081+ #else
1082+ unsigned long options ;
1083+ #endif
1084+
1085+ options = SSL_OP_CIPHER_SERVER_PREFERENCE |
10801086#if !defined (OPENSSL_NO_ECDH ) && OPENSSL_VERSION_NUMBER >= 0x10000000L
10811087 SSL_OP_SINGLE_ECDH_USE |
10821088#endif
@@ -1343,7 +1349,7 @@ static pj_status_t init_ossl_ctx(pj_ssl_sock_t *ssock)
13431349 X509 * xcert = NULL ;
13441350
13451351 cbio = BIO_new_mem_buf ((void * )cert -> cert_buf .ptr ,
1346- cert -> cert_buf .slen );
1352+ ( int ) cert -> cert_buf .slen );
13471353 if (cbio != NULL ) {
13481354 xcert = PEM_read_bio_X509 (cbio , NULL , 0 , NULL );
13491355 if (xcert != NULL ) {
@@ -1370,7 +1376,7 @@ static pj_status_t init_ossl_ctx(pj_ssl_sock_t *ssock)
13701376
13711377 if (cert -> CA_buf .slen && !CA_loaded ) {
13721378 BIO * cbio = BIO_new_mem_buf ((void * )cert -> CA_buf .ptr ,
1373- cert -> CA_buf .slen );
1379+ ( int ) cert -> CA_buf .slen );
13741380 X509_STORE * cts = SSL_CTX_get_cert_store (ctx );
13751381
13761382 if (cbio && cts ) {
@@ -1413,7 +1419,7 @@ static pj_status_t init_ossl_ctx(pj_ssl_sock_t *ssock)
14131419 EVP_PKEY * pkey = NULL ;
14141420
14151421 kbio = BIO_new_mem_buf ((void * )cert -> privkey_buf .ptr ,
1416- cert -> privkey_buf .slen );
1422+ ( int ) cert -> privkey_buf .slen );
14171423 if (kbio != NULL ) {
14181424 pkey = PEM_read_bio_PrivateKey (kbio , NULL , & password_cb ,
14191425 cert );
@@ -1581,7 +1587,7 @@ static pj_status_t init_ossl_ctx(pj_ssl_sock_t *ssock)
15811587 X509_NAME * xn = NULL ;
15821588 STACK_OF (X509_NAME ) * sk = NULL ;
15831589 BIO * new_bio = BIO_new_mem_buf ((void * )cert -> CA_buf .ptr ,
1584- cert -> CA_buf .slen );
1590+ ( int ) cert -> CA_buf .slen );
15851591
15861592 sk = sk_X509_NAME_new (xname_cmp );
15871593
@@ -2586,7 +2592,7 @@ static pj_status_t ssl_write(pj_ssl_sock_t *ssock, const void *data,
25862592 } else {
25872593 /* Some problem occurred */
25882594 status = STATUS_FROM_SSL_ERR2 ("Write" , ssock , * nwritten ,
2589- err , size );
2595+ err , ( int ) size );
25902596 }
25912597 } else if (* nwritten < size ) {
25922598 /* nwritten < size, shouldn't happen, unless write BIO cannot hold
0 commit comments