style: fixed oversized lines.

Tuure Vartiainen · Tuure Vartiainen · commit c9678ab695ac · 2017-10-05T01:53:17.000+03:00
diff --git a/src/ngx_http_lua_module.c b/src/ngx_http_lua_module.c
@@ -1070,7 +1070,9 @@ ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
      }
 
      if (conf->srv.ssl_psk_identity_hint.len) {
-         dd("ssl psk identity hint: %.*s", (int) conf->srv.ssl_psk_identity_hint.len, conf->srv.ssl_psk_identity_hint.data);
+         dd("ssl psk identity hint: %.*s", 
+             (int) conf->srv.ssl_psk_identity_hint.len,
+             conf->srv.ssl_psk_identity_hint.data);
 
  #   if OPENSSL_VERSION_NUMBER >= 0x1000000fL
 
@@ -1082,7 +1084,8 @@ ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
              return NGX_CONF_ERROR;
          }
 
-         if (SSL_CTX_use_psk_identity_hint(sscf->ssl.ctx, (const char *) conf->srv.ssl_psk_identity_hint.data) == 0) {
+         if (SSL_CTX_use_psk_identity_hint(sscf->ssl.ctx,
+               (const char *) conf->srv.ssl_psk_identity_hint.data) == 0) {
              ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
                            "SSL_CTX_use_psk_identity_hint(\"%V\") failed",
                            &conf->srv.ssl_psk_identity_hint);
@@ -1123,7 +1126,8 @@ ngx_http_lua_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
 #   if OPENSSL_VERSION_NUMBER >= 0x1000000fL
 
-        SSL_CTX_set_psk_server_callback(sscf->ssl.ctx, ngx_http_lua_ssl_psk_server_handler);
+        SSL_CTX_set_psk_server_callback(sscf->ssl.ctx, 
+                                        ngx_http_lua_ssl_psk_server_handler);
 
 #   else
 
@@ -1387,11 +1391,13 @@ ngx_http_lua_set_ssl(ngx_conf_t *cf, ngx_http_lua_loc_conf_t *llcf)
 
     if (llcf->ssl_psk_identity.len && llcf->ssl_psk_key.len) {
         dd("ssl psk identity: %.*s", (int) llcf->ssl_psk_identity.len, llcf->ssl_psk_identity.data);
-        dd("ssl psk key: %.*s", (int) llcf->ssl_psk_key.len, llcf->ssl_psk_key.data);
+        dd("ssl psk key: %.*s", (int) llcf->ssl_psk_key.len,
+                                      llcf->ssl_psk_key.data);
 
 #   if OPENSSL_VERSION_NUMBER >= 0x1000000fL
 
-        SSL_CTX_set_psk_client_callback(llcf->ssl->ctx, ngx_http_lua_ssl_psk_client_handler);
+        SSL_CTX_set_psk_client_callback(llcf->ssl->ctx,
+                                        ngx_http_lua_ssl_psk_client_handler);
 
 #   else
 
diff --git a/src/ngx_http_lua_socket_tcp.c b/src/ngx_http_lua_socket_tcp.c
@@ -1630,7 +1630,8 @@ ngx_http_lua_socket_tcp_sslgetpskidhint(lua_State *L)
         return 1;
     }
 
-    lua_pushlstring(L, (char *) u->ssl_psk_identity_hint.data, u->ssl_psk_identity_hint.len);
+    lua_pushlstring(L, (char *) u->ssl_psk_identity_hint.data,
+                                u->ssl_psk_identity_hint.len);
     return 1;
 }
 
diff --git a/src/ngx_http_lua_ssl_pskby.c b/src/ngx_http_lua_ssl_pskby.c
@@ -175,7 +175,8 @@ ngx_http_lua_ssl_psk_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 }
 
 
-unsigned int ngx_http_lua_ssl_psk_server_handler(ngx_ssl_conn_t *ssl_conn, const char *identity, unsigned char *psk, unsigned int max_psk_len)
+unsigned int ngx_http_lua_ssl_psk_server_handler(ngx_ssl_conn_t *ssl_conn,
+    const char *identity, unsigned char *psk, unsigned int max_psk_len)
 {
     lua_State                       *L;
     ngx_int_t                        rc;
@@ -252,7 +253,8 @@ unsigned int ngx_http_lua_ssl_psk_server_handler(ngx_ssl_conn_t *ssl_conn, const
     }
 
     if (identity == NULL) {
-        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "client did not send TLS-PSK identity");
+        ngx_ssl_error(NGX_LOG_ALERT, c->log, 0,
+            "client did not send TLS-PSK identity");
         goto failed;
     }
 
@@ -312,7 +314,9 @@ unsigned int ngx_http_lua_ssl_psk_server_handler(ngx_ssl_conn_t *ssl_conn, const
         }
 
         if (cctx->psk_key.len > (size_t) max_psk_len) {
-            ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "psk_key.len: %i > max_psk_len: %i", cctx->psk_key.len, max_psk_len);
+            ngx_ssl_error(NGX_LOG_ALERT, c->log, 0,
+                "psk_key.len: %i > max_psk_len: %i",
+                    cctx->psk_key.len, max_psk_len);
 
             return cctx->exit_code;
         }
@@ -341,7 +345,9 @@ unsigned int ngx_http_lua_ssl_psk_server_handler(ngx_ssl_conn_t *ssl_conn, const
 }
 
 
-unsigned int ngx_http_lua_ssl_psk_client_handler(ngx_ssl_conn_t *ssl_conn, const char *hint, char *identity, unsigned int max_identity_len, unsigned char *psk, unsigned int max_psk_len)
+unsigned int ngx_http_lua_ssl_psk_client_handler(ngx_ssl_conn_t *ssl_conn,
+    const char *hint, char *identity, unsigned int max_identity_len,
+    unsigned char *psk, unsigned int max_psk_len)
 {
     ngx_connection_t                *c;
     ngx_connection_t                *dc;  /* downstream connection */
@@ -382,7 +388,8 @@ unsigned int ngx_http_lua_ssl_psk_client_handler(ngx_ssl_conn_t *ssl_conn, const
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
 
     if (llcf == NULL) {
-        ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0, "getting module loc conf failed");
+        ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0,
+            "getting module loc conf failed");
         goto failed;
     }
 
@@ -411,11 +418,13 @@ unsigned int ngx_http_lua_ssl_psk_client_handler(ngx_ssl_conn_t *ssl_conn, const
 
 new_ssl_psk_identity_hint:
 
-            u->ssl_psk_identity_hint.data = ngx_alloc(hint_len + 1, ngx_cycle->log);
+            u->ssl_psk_identity_hint.data = ngx_alloc(hint_len + 1,
+                                                      ngx_cycle->log);
             if (u->ssl_psk_identity_hint.data == NULL) {
                 u->ssl_psk_identity_hint.len = 0;
 
-                ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0, "could not allocate memory for ssl_psk_identity_hint");
+                ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0,
+                    "could not allocate memory for ssl_psk_identity_hint");
                 goto failed;
             }
 
@@ -426,15 +435,19 @@ unsigned int ngx_http_lua_ssl_psk_client_handler(ngx_ssl_conn_t *ssl_conn, const
 
     if (llcf->ssl_psk_identity.len) {
         if (llcf->ssl_psk_identity.len <= max_identity_len) {
-            ngx_snprintf((u_char *) identity, max_identity_len, "%V", &llcf->ssl_psk_identity);
+            ngx_snprintf((u_char *) identity, max_identity_len, "%V", 
+                         &llcf->ssl_psk_identity);
         }
         else {
-            ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0, "ssl_psk_identity.len: %i > max_identity_len: %i", llcf->ssl_psk_identity.len, max_identity_len);
+            ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0, 
+                          "ssl_psk_identity.len: %i > max_identity_len: %i",
+                          llcf->ssl_psk_identity.len, max_identity_len);
             goto failed;
         }
     }
     else {
-        ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0, "no ssl_psk_identity defined");
+        ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0,
+                      "no ssl_psk_identity defined");
         goto failed;
     }
 
@@ -444,7 +457,9 @@ unsigned int ngx_http_lua_ssl_psk_client_handler(ngx_ssl_conn_t *ssl_conn, const
             return llcf->ssl_psk_key.len;
         }
         else {
-            ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0, "ssl_psk_key.len: %i > max_psk_len: %i", llcf->ssl_psk_key.len, max_psk_len);
+            ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0,
+                          "ssl_psk_key.len: %i > max_psk_len: %i",
+                          llcf->ssl_psk_key.len, max_psk_len);
             goto failed;
         }
     }
diff --git a/src/ngx_http_lua_ssl_pskby.h b/src/ngx_http_lua_ssl_pskby.h
@@ -29,9 +29,12 @@ char *ngx_http_lua_ssl_psk_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
 char *ngx_http_lua_ssl_psk_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 
-unsigned int ngx_http_lua_ssl_psk_server_handler(ngx_ssl_conn_t *ssl_conn, const char *identity, unsigned char *psk, unsigned int max_psk_len);
+unsigned int ngx_http_lua_ssl_psk_server_handler(ngx_ssl_conn_t *ssl_conn,
+    const char *identity, unsigned char *psk, unsigned int max_psk_len);
 
-unsigned int ngx_http_lua_ssl_psk_client_handler(ngx_ssl_conn_t *ssl_conn, const char *hint, char *identity, unsigned int max_identity_len, unsigned char *psk, unsigned int max_psk_len);
+unsigned int ngx_http_lua_ssl_psk_client_handler(ngx_ssl_conn_t *ssl_conn,
+    const char *hint, char *identity, unsigned int max_identity_len,
+    unsigned char *psk, unsigned int max_psk_len);
 
 #endif  /* NGX_HTTP_SSL */
 

Original file line number	Diff line number	Diff line change
`@@ -1630,7 +1630,8 @@ ngx_http_lua_socket_tcp_sslgetpskidhint(lua_State *L)`
`1630`	`1630`	`return 1;`
`1631`	`1631`	`}`
`1632`	`1632`
`1633`		`- lua_pushlstring(L, (char *) u->ssl_psk_identity_hint.data, u->ssl_psk_identity_hint.len);`
	`1633`	`+ lua_pushlstring(L, (char *) u->ssl_psk_identity_hint.data,`
	`1634`	`+ u->ssl_psk_identity_hint.len);`
`1634`	`1635`	`return 1;`
`1635`	`1636`	`}`
`1636`	`1637`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,8 @@ ngx_http_lua_ssl_psk_by_lua(ngx_conf_t cf, ngx_command_t cmd,`
`175`	`175`	`}`
`176`	`176`
`177`	`177`
`178`		`-unsigned int ngx_http_lua_ssl_psk_server_handler(ngx_ssl_conn_t ssl_conn, const char identity, unsigned char *psk, unsigned int max_psk_len)`
	`178`	`+unsigned int ngx_http_lua_ssl_psk_server_handler(ngx_ssl_conn_t *ssl_conn,`
	`179`	`+ const char identity, unsigned char psk, unsigned int max_psk_len)`
`179`	`180`	`{`
`180`	`181`	`lua_State *L;`
`181`	`182`	`ngx_int_t rc;`
`@@ -252,7 +253,8 @@ unsigned int ngx_http_lua_ssl_psk_server_handler(ngx_ssl_conn_t *ssl_conn, const`
`252`	`253`	`}`
`253`	`254`
`254`	`255`	`if (identity == NULL) {`
`255`		`- ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "client did not send TLS-PSK identity");`
	`256`	`+ ngx_ssl_error(NGX_LOG_ALERT, c->log, 0,`
	`257`	`+ "client did not send TLS-PSK identity");`
`256`	`258`	`goto failed;`
`257`	`259`	`}`
`258`	`260`
`@@ -312,7 +314,9 @@ unsigned int ngx_http_lua_ssl_psk_server_handler(ngx_ssl_conn_t *ssl_conn, const`
`312`	`314`	`}`
`313`	`315`
`314`	`316`	`if (cctx->psk_key.len > (size_t) max_psk_len) {`
`315`		`- ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "psk_key.len: %i > max_psk_len: %i", cctx->psk_key.len, max_psk_len);`
	`317`	`+ ngx_ssl_error(NGX_LOG_ALERT, c->log, 0,`
	`318`	`+ "psk_key.len: %i > max_psk_len: %i",`
	`319`	`+ cctx->psk_key.len, max_psk_len);`
`316`	`320`
`317`	`321`	`return cctx->exit_code;`
`318`	`322`	`}`
`@@ -341,7 +345,9 @@ unsigned int ngx_http_lua_ssl_psk_server_handler(ngx_ssl_conn_t *ssl_conn, const`
`341`	`345`	`}`
`342`	`346`
`343`	`347`
`344`		`-unsigned int ngx_http_lua_ssl_psk_client_handler(ngx_ssl_conn_t ssl_conn, const char hint, char identity, unsigned int max_identity_len, unsigned char psk, unsigned int max_psk_len)`
	`348`	`+unsigned int ngx_http_lua_ssl_psk_client_handler(ngx_ssl_conn_t *ssl_conn,`
	`349`	`+ const char hint, char identity, unsigned int max_identity_len,`
	`350`	`+ unsigned char *psk, unsigned int max_psk_len)`
`345`	`351`	`{`
`346`	`352`	`ngx_connection_t *c;`
`347`	`353`	`ngx_connection_t dc; / downstream connection */`
`@@ -382,7 +388,8 @@ unsigned int ngx_http_lua_ssl_psk_client_handler(ngx_ssl_conn_t *ssl_conn, const`
`382`	`388`	`llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);`
`383`	`389`
`384`	`390`	`if (llcf == NULL) {`
`385`		`- ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0, "getting module loc conf failed");`
	`391`	`+ ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0,`
	`392`	`+ "getting module loc conf failed");`
`386`	`393`	`goto failed;`
`387`	`394`	`}`
`388`	`395`
`@@ -411,11 +418,13 @@ unsigned int ngx_http_lua_ssl_psk_client_handler(ngx_ssl_conn_t *ssl_conn, const`
`411`	`418`
`412`	`419`	`new_ssl_psk_identity_hint:`
`413`	`420`
`414`		`- u->ssl_psk_identity_hint.data = ngx_alloc(hint_len + 1, ngx_cycle->log);`
	`421`	`+ u->ssl_psk_identity_hint.data = ngx_alloc(hint_len + 1,`
	`422`	`+ ngx_cycle->log);`
`415`	`423`	`if (u->ssl_psk_identity_hint.data == NULL) {`
`416`	`424`	`u->ssl_psk_identity_hint.len = 0;`
`417`	`425`
`418`		`- ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0, "could not allocate memory for ssl_psk_identity_hint");`
	`426`	`+ ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0,`
	`427`	`+ "could not allocate memory for ssl_psk_identity_hint");`
`419`	`428`	`goto failed;`
`420`	`429`	`}`
`421`	`430`
`@@ -426,15 +435,19 @@ unsigned int ngx_http_lua_ssl_psk_client_handler(ngx_ssl_conn_t *ssl_conn, const`
`426`	`435`
`427`	`436`	`if (llcf->ssl_psk_identity.len) {`
`428`	`437`	`if (llcf->ssl_psk_identity.len <= max_identity_len) {`
`429`		`- ngx_snprintf((u_char *) identity, max_identity_len, "%V", &llcf->ssl_psk_identity);`
	`438`	`+ ngx_snprintf((u_char *) identity, max_identity_len, "%V",`
	`439`	`+ &llcf->ssl_psk_identity);`
`430`	`440`	`}`
`431`	`441`	`else {`
`432`		`- ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0, "ssl_psk_identity.len: %i > max_identity_len: %i", llcf->ssl_psk_identity.len, max_identity_len);`
	`442`	`+ ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0,`
	`443`	`+ "ssl_psk_identity.len: %i > max_identity_len: %i",`
	`444`	`+ llcf->ssl_psk_identity.len, max_identity_len);`
`433`	`445`	`goto failed;`
`434`	`446`	`}`
`435`	`447`	`}`
`436`	`448`	`else {`
`437`		`- ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0, "no ssl_psk_identity defined");`
	`449`	`+ ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0,`
	`450`	`+ "no ssl_psk_identity defined");`
`438`	`451`	`goto failed;`
`439`	`452`	`}`
`440`	`453`
`@@ -444,7 +457,9 @@ unsigned int ngx_http_lua_ssl_psk_client_handler(ngx_ssl_conn_t *ssl_conn, const`
`444`	`457`	`return llcf->ssl_psk_key.len;`
`445`	`458`	`}`
`446`	`459`	`else {`
`447`		`- ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0, "ssl_psk_key.len: %i > max_psk_len: %i", llcf->ssl_psk_key.len, max_psk_len);`
	`460`	`+ ngx_ssl_error(NGX_LOG_ALERT, dc->log, 0,`
	`461`	`+ "ssl_psk_key.len: %i > max_psk_len: %i",`
	`462`	`+ llcf->ssl_psk_key.len, max_psk_len);`
`448`	`463`	`goto failed;`
`449`	`464`	`}`
`450`	`465`	`}`