merged nginx-1.8.1: fixed coding style in ngx_event_openssl.c

CapHuang0511 · Nov 30, 2016 · 2981f78 · 2981f78
1 parent 6b8a7fa
commit 2981f78
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
@@ -18,9 +18,6 @@ typedef struct {
 } ngx_openssl_conf_t;
 
 
-typedef int (ngx_ssl_read_bio_handler_pt)(char *, int, int, void *);
-
-
 static int ngx_ssl_password_callback(char *buf, int size, int rwflag,
     void *userdata);
 static int ngx_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store);
@@ -682,7 +679,7 @@ ngx_ssl_verify_callback(int ok, X509_STORE_CTX *x509_store)
 
     ngx_log_debug5(NGX_LOG_DEBUG_EVENT, c->log, 0,
                    "verify:%d, error:%d, depth:%d, "
-                   "subject:\"%s\", issuer: \"%s\"",
+                   "subject:\"%s\", issuer:\"%s\"",
                    ok, err, depth, subject, issuer);
 
     if (sname) {
@@ -3283,7 +3280,8 @@ ngx_ssl_get_certificate(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
     }
 
     return NGX_OK;
-} 
+}
+
 
 ngx_int_t
 ngx_ssl_get_subject_dn(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)

diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
@@ -65,12 +65,6 @@ typedef struct {
     unsigned                    handshake_buffer_set:1;
 } ngx_ssl_connection_t;
 
-typedef struct {
-    ngx_ssl_t                  *ssl;
-    ngx_str_t                  *server_name;
-    ngx_str_t                  *type;
-    ngx_str_t                  *encrypt;
-} ngx_http_ssl_pphrase_dialog_conf_t;
 
 #define NGX_SSL_NO_SCACHE            -2
 #define NGX_SSL_NONE_SCACHE          -3
@@ -218,12 +212,5 @@ extern int  ngx_ssl_session_ticket_keys_index;
 extern int  ngx_ssl_certificate_index;
 extern int  ngx_ssl_stapling_index;
 
-#if (OPENSSL_VERSION_NUMBER < 0x00904000)
-#define ngx_ssl_pem_read_bio_x509(b, x, cb, arg)    \
-    PEM_read_bio_X509(b, x, cb)
-#else
-#define ngx_ssl_pem_read_bio_x509(b, x, cb, arg)    \
-    PEM_read_bio_X509(b, x, cb, arg)
-#endif
 
 #endif /* _NGX_EVENT_OPENSSL_H_INCLUDED_ */