Changeset 5980 for pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

Timestamp:

May 9, 2019 4:35:41 AM (5 years ago)

Author:

nanang

Message:

Re #1298: Updated PJLIB to use PJ_ERROR consistently.

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c (modified) (8 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -804 +804 @@
                 status = GET_SSL_STATUS(ssock);
                 if (cert->CA_file.slen) {
-                    PJ_LOG(1,(ssock->pool->obj_name,
-                              "Error loading CA list file '%s'",
-                              cert->CA_file.ptr));
+                    PJ_PERROR(1,(ssock->pool->obj_name, status,
+                                 "Error loading CA list file '%s'",
+                                 cert->CA_file.ptr));
                 }
                 if (cert->CA_path.slen) {
-                    PJ_LOG(1,(ssock->pool->obj_name,
-                              "Error loading CA path '%s'",
-                              cert->CA_path.ptr));
+                    PJ_PERROR(1,(ssock->pool->obj_name, status,
+                                 "Error loading CA path '%s'",
+                                 cert->CA_path.ptr));
                 }
                 SSL_CTX_free(ctx);
@@ -833 +833 @@
             if(rc != 1) {
                 status = GET_SSL_STATUS(ssock);
-                PJ_LOG(1,(ssock->pool->obj_name, "Error loading certificate "
-                          "chain file '%s'", cert->cert_file.ptr));
+                PJ_PERROR(1,(ssock->pool->obj_name, status,
+                             "Error loading certificate chain file '%s'",
+                             cert->cert_file.ptr));
                 SSL_CTX_free(ctx);
                 return status;
@@ -849 +850 @@
             if(rc != 1) {
                 status = GET_SSL_STATUS(ssock);
-                PJ_LOG(1,(ssock->pool->obj_name, "Error adding private key "
-                          "from '%s'", cert->privkey_file.ptr));
+                PJ_PERROR(1,(ssock->pool->obj_name, status,
+                             "Error adding private key from '%s'",
+                             cert->privkey_file.ptr));
                 SSL_CTX_free(ctx);
                 return status;
@@ -892 +894 @@
                     if (rc != 1) {
                         status = GET_SSL_STATUS(ssock);
-                        PJ_LOG(1, (ssock->pool->obj_name, "Error loading "
-                                   "chain certificate from buffer"));
+                        PJ_PERROR(1,(ssock->pool->obj_name, status,
+                              "Error loading chain certificate from buffer"));
                         X509_free(xcert);
                         BIO_free(cbio);
@@ -940 +942 @@
                     if (rc != 1) {
                         status = GET_SSL_STATUS(ssock);
-                        PJ_LOG(1, (ssock->pool->obj_name, "Error adding "
-                                   "private key from buffer"));
+                        PJ_PERROR(1,(ssock->pool->obj_name, status,
+                                     "Error adding private key from buffer"));
                         EVP_PKEY_free(pkey);
                         BIO_free(kbio);
@@ -1004 +1006 @@
                               "Additional certificate '%s' loaded.", cf));
                 } else {
-                    pj_perror(1, ssock->pool->obj_name, GET_SSL_STATUS(ssock),
-                              "Error loading certificate file '%s'", cf);
+                    PJ_PERROR(1,(ssock->pool->obj_name, GET_SSL_STATUS(ssock),
+                                 "Error loading certificate file '%s'", cf));
                     ERR_clear_error();
                 }
@@ -1306 +1308 @@
 static void set_entropy(pj_ssl_sock_t *ssock)
 {
-    int ret;
+    int ret = 0;
 
     switch (ssock->param.entropy_type) {
@@ -1324 +1326 @@
             break;
         case PJ_SSL_ENTROPY_NONE:
-            default:
-            return;
+        default:
             break;
     }
 
     if (ret < 0) {
-        PJ_LOG(3, (ssock->pool->obj_name, "SSL failed to reseed with "
-                                          "entropy type %d",
-                                          ssock->param.entropy_type));
+        PJ_LOG(3, (ssock->pool->obj_name,
+                   "SSL failed to reseed with entropy type %d "
+                   "[native err=%d]",
+                   ssock->param.entropy_type, ret));
     }
 }