tests: Changed ssl_psk_by_lua* with ssl_certificate_by_lua*.

doc: Changed ssl_psk_by_lua* with ssl_certificate_by_lua*.
openresty · Oct 9, 2017 · ed103c0 · ed103c0
1 parent 5cb101c
commit ed103c0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/lib/ngx/ssl.md b/lib/ngx/ssl.md
@@ -402,7 +402,7 @@ set_psk_key
 ------------
 **syntax:** *ok, err = ssl.set_psk_key(psk_key)*
 
-**context:** *ssl_psk_by_lua&#42;*
+**context:** *ssl_certificate_by_lua&#42;*
 
 Sets the TLS-PSK key for the current SSL connection.
 
@@ -416,7 +416,7 @@ get_psk_identity
 ------------
 **syntax:** *identity, err = ssl.get_psk_identity()*
 
-**context:** *ssl_psk_by_lua&#42;*
+**context:** *ssl_certificate_by_lua&#42;*
 
 Returns a TLS-PSK identity a client sent for the current SSL connection. Returns `nil` and
 a string describing the error otherwise.

diff --git a/t/ssl-psk.t b/t/ssl-psk.t
@@ -34,23 +34,27 @@ __DATA__
         ssl_protocols TLSv1;
         ssl_ciphers PSK;
 
-        ssl_psk_by_lua_block {
+        ssl_certificate_by_lua_block {
             local ssl = require "ngx.ssl"
 
             local psk_key = "psk_test_key"
 
             local psk_identity, err = ssl.get_psk_identity()
             if not psk_identity then
+                if err == "not in psk context" then
+                    -- handler was not called by TLS-PSK callback
+                    return
+                end
                 ngx.log(ngx.ERR, "failed to get psk identity: ", err)
-                return ngx.ERROR
+                return ngx.exit(ngx.ERROR)
             end
 
             print("client psk identity: ", psk_identity)
 
             local ok, err = ssl.set_psk_key(psk_key)
             if not ok then
                 ngx.log(ngx.ERR, "failed to set psk key: ", err)
-                return ngx.ERROR
+                return ngx.exit(ngx.ERROR)
             end
         }
 
@@ -158,23 +162,27 @@ client psk identity: psk_test_identity
         ssl_protocols TLSv1;
         ssl_ciphers PSK;
 
-        ssl_psk_by_lua_block {
+        ssl_certificate_by_lua_block {
             local ssl = require "ngx.ssl"
 
             local psk_key = "psk_test_key2"
 
             local psk_identity, err = ssl.get_psk_identity()
             if not psk_identity then
+                if err == "not in psk context" then
+                    -- handler was not called by TLS-PSK callback
+                    return
+                end
                 ngx.log(ngx.ERR, "failed to get psk identity: ", err)
-                return ngx.ERROR
+                return ngx.exit(ngx.ERROR)
             end
 
             print("client psk identity: ", psk_identity)
 
             local ok, err = ssl.set_psk_key(psk_key)
             if not ok then
                 ngx.log(ngx.ERR, "failed to set psk key: ", err)
-                return ngx.ERROR
+                return ngx.exit(ngx.ERROR)
             end
         }