chore(tests) revert BoringSSL specific patterns

scripts/types_test.py

@@ -3,7 +3,7 @@
 {
     "bn": {
         "new_from": "new(math.random(1, 2333333))",
-        "print": "to_hex():upper",
+        "print": "to_hex",
     },
     "number": {
         "new_from": "ngx.time()",

t/openssl/bn.t

@@ -157,8 +157,8 @@ bn:to_binary failed
     }
 --- request
     GET /t
---- response_body_like eval
-"5[Bb]25"
+--- response_body eval
+"5B25"
 --- no_error_log
 [error]
 

t/openssl/cipher.t

@@ -27,7 +27,7 @@ __DATA__
 --- config
     location =/t {
         content_by_lua_block {
-            local cipher = myassert(require("resty.openssl.cipher").new("aes-256-cbc"))
+            local cipher = myassert(require("resty.openssl.cipher").new("aes256"))
 
             myassert(cipher:init(string.rep("0", 32), string.rep("0", 16), {
                 is_encrypt = true,
@@ -65,7 +65,7 @@ __DATA__
 --- config
     location =/t {
         content_by_lua_block {
-            local cipher = myassert(require("resty.openssl.cipher").new("aes-256-cbc"))
+            local cipher = myassert(require("resty.openssl.cipher").new("aes256"))
 
             local s, err = cipher:update("1")
             ngx.say(err)
@@ -87,7 +87,7 @@ cipher:update: cipher not initalized, call cipher:init first
 --- config
     location =/t {
         content_by_lua_block {
-            local cipher = myassert(require("resty.openssl.cipher").new("aes-256-cbc"))
+            local cipher = myassert(require("resty.openssl.cipher").new("aes256"))
 
             local s = myassert(cipher:encrypt(string.rep("0", 32), string.rep("0", 16), '1'))
 
@@ -106,7 +106,7 @@ cipher:update: cipher not initalized, call cipher:init first
 --- config
     location =/t {
         content_by_lua_block {
-            local cipher = myassert(require("resty.openssl.cipher").new("aes-256-cbc"))
+            local cipher = myassert(require("resty.openssl.cipher").new("aes256"))
 
             local s, err = cipher:encrypt(string.rep("0", 32), string.rep("0", 16), '1', true)
             ngx.say(s)
@@ -132,7 +132,7 @@ VhGyRCcMvlAgUjTYrqiWpg=="
 --- config
     location =/t {
         content_by_lua_block {
-            local cipher = myassert(require("resty.openssl.cipher").new("aes-256-cbc"))
+            local cipher = myassert(require("resty.openssl.cipher").new("aes256"))
 
             local s = myassert(cipher:decrypt(string.rep("0", 32), string.rep("0", 16),
                 ngx.decode_base64("VhGyRCcMvlAgUjTYrqiWpg==")))
@@ -152,7 +152,7 @@ VhGyRCcMvlAgUjTYrqiWpg=="
 --- config
     location =/t {
         content_by_lua_block {
-            local cipher = myassert(require("resty.openssl.cipher").new("aes-256-cbc"))
+            local cipher = myassert(require("resty.openssl.cipher").new("aes256"))
 
             local s = myassert(cipher:decrypt(string.rep("0", 32), string.rep("0", 16),
                 ngx.decode_base64("VhGyRCcMvlAgUjTYrqiWpg=="), true))
@@ -172,7 +172,7 @@ VhGyRCcMvlAgUjTYrqiWpg=="
 --- config
     location =/t {
         content_by_lua_block {
-            local cipher = myassert(require("resty.openssl.cipher").new("aes-256-cbc"))
+            local cipher = myassert(require("resty.openssl.cipher").new("aes256"))
 
             local ok = myassert(cipher:init(string.rep("0", 32), string.rep("0", 16), {
                 is_encrypt = true,
@@ -214,7 +214,7 @@ dtpklHxY9IbgmSw84+2XMr0Vy/S1392+rvu0A3GW1Wo=
 --- config
     location =/t {
         content_by_lua_block {
-            local cipher = myassert(require("resty.openssl.cipher").new("aes-256-cbc"))
+            local cipher = myassert(require("resty.openssl.cipher").new("aes256"))
 
             local ok = myassert(cipher:init(string.rep("0", 32), string.rep("0", 16), {
                 is_encrypt = false,
@@ -273,9 +273,9 @@ defghi
                 end))
             end
 
-            local cipher = myassert(require("resty.openssl.cipher").new("aes-256-cbc"))
+            local cipher = myassert(require("resty.openssl.cipher").new("aes256"))
 
-            -- openssl enc -aes-256-cbc -pass pass:xxx -S 797979 -P -md md5
+            -- openssl enc -aes256 -pass pass:xxx -S 797979 -P -md md5
             local key, iv = cipher:derive("xxx", "yyy", 1, "md5")
 
             ngx.say(key:tohex())
@@ -311,9 +311,9 @@ no iv
                 end))
             end
 
-            local cipher = myassert(require("resty.openssl.cipher").new("aes-256-cbc"))
+            local cipher = myassert(require("resty.openssl.cipher").new("aes256"))
 
-            -- openssl enc -aes-256-cbc -pass pass:xxx -nosalt -P -md sha1
+            -- openssl enc -aes256 -pass pass:xxx -nosalt -P -md sha1
             local key, iv = cipher:derive("xxx")
 
             ngx.say(key:tohex())

t/openssl/helper.lua

@@ -51,7 +51,7 @@ local function to_hex(bin)
   if err then
     error(err)
   end
-  return hex:upper()
+  return hex
 end
 
 local function myassert(...)

t/openssl/pkcs12.t

@@ -39,8 +39,8 @@ __DATA__
 
             local r = myassert(pkcs12.decode(pp, "badssl.com"))
 
-            ngx.say(r.key:get_parameters().d:to_hex():upper())
-            ngx.say(r.cert:get_serial_number():to_hex():upper())
+            ngx.say(r.key:get_parameters().d:to_hex())
+            ngx.say(r.cert:get_serial_number():to_hex())
         }
     }
 --- request
@@ -96,7 +96,7 @@ pkcs12.decode.+mac verify failure.*
             end
 
             local pkcs12 = require "resty.openssl.pkcs12"
-            local cert, key = require("helper").create_self_signed({ type = 'EC', curve = "prime256v1" })
+            local cert, key = require("helper").create_self_signed({ type = 'EC' })
             local x509 = require("resty.openssl.x509")
             local ca1 = myassert(x509.new(io.open("t/fixtures/GlobalSign.pem"):read("*a")))
             local ca2 = myassert(x509.new(io.open("t/fixtures/GlobalSign_sub.pem"):read("*a")))
@@ -152,7 +152,7 @@ pkcs12.decode.+mac verify failure.*
             end
     
             local pkcs12 = require "resty.openssl.pkcs12"
-            local cert, key = require("helper").create_self_signed({ type = 'EC', curve = "prime256v1" })
+            local cert, key = require("helper").create_self_signed({ type = 'EC' })
             local x509 = require("resty.openssl.x509")
             local ca1 = myassert(x509.new(io.open("t/fixtures/GlobalSign.pem"):read("*a")))
             local ca2 = myassert(x509.new(io.open("t/fixtures/GlobalSign_sub.pem"):read("*a")))
@@ -165,8 +165,8 @@ pkcs12.decode.+mac verify failure.*
             }))
 
             local r = myassert(pkcs12.decode(p12, nil))
-            ngx.say(#r.key:get_parameters().x:to_hex():upper())
-            ngx.say(r.cert:get_serial_number():to_hex():upper())
+            ngx.say(#r.key:get_parameters().x:to_hex())
+            ngx.say(r.cert:get_serial_number():to_hex())
             ngx.say(#r.cacerts)
             ngx.say(r.friendly_name)
             -- same as empty string
@@ -181,7 +181,7 @@ pkcs12.decode.+mac verify failure.*
 --- request
     GET /t
 --- response_body_like eval
-'6\d
+'4\d
 0
 2
 myname
@@ -202,8 +202,8 @@ pkcs12.decode.+mac verify failure.*
             end
 
             local pkcs12 = require "resty.openssl.pkcs12"
-            local cert, key = require("helper").create_self_signed({ type = 'EC', curve = "prime256v1" })
-            local key2 = require("resty.openssl.pkey").new({ type = 'EC', curve = "prime256v1" })
+            local cert, key = require("helper").create_self_signed({ type = 'EC' })
+            local key2 = require("resty.openssl.pkey").new({ type = 'EC' })
             
             local r, err = pkcs12.encode({
                 friendly_name = "myname",

t/openssl/pkey.t

@@ -327,7 +327,7 @@ ok
             local params = myassert(p:get_parameters())
 
             for _, k in ipairs(require("resty.openssl.rsa").params) do
-                local b = myassert(params[k]:to_hex():upper())
+                local b = myassert(params[k]:to_hex())
                 ngx.say(b)
             end
             local got = params.dne
@@ -357,7 +357,6 @@ nil
         content_by_lua_block {
             local p = myassert(require("resty.openssl.pkey").new({
                 type = "EC",
-                curve = "prime256v1",
             }))
 
             local params = myassert(p:get_parameters())
@@ -366,7 +365,7 @@ nil
             ngx.say(group)
             for _, k in ipairs(require("resty.openssl.ec").params) do
                 if k ~= "group" then
-                    local b = myassert(params[k]:to_hex():upper())
+                    local b = myassert(params[k]:to_hex())
 
                     ngx.say(b)
                 end
@@ -378,11 +377,11 @@ nil
 --- request
     GET /t
 --- response_body_like eval
-"415
-[A-F0-9]{1,130}
-[A-F0-9]{1,64}
-[A-F0-9]{1,64}
-[A-F0-9]{1,64}
+"409
+[A-F0-9]{1,98}
+[A-F0-9]{1,48}
+[A-F0-9]{1,48}
+[A-F0-9]{1,48}
 nil
 "
 --- no_error_log
@@ -424,10 +423,10 @@ nil
 
             local params = myassert(p:get_parameters())
 
-            ngx.say(params.p:to_hex():upper())
-            ngx.say(params.g:to_hex():upper())
-            ngx.say(params.private:to_hex():upper())
-            ngx.say(params.public:to_hex():upper())
+            ngx.say(params.p:to_hex())
+            ngx.say(params.g:to_hex())
+            ngx.say(params.private:to_hex())
+            ngx.say(params.public:to_hex())
         }
     }
 --- request
@@ -740,10 +739,10 @@ true
 
             local params = myassert(p:get_parameters())
 
-            ngx.say(params.p:to_hex():upper())
-            ngx.say(params.g:to_hex():upper())
-            ngx.say(params.private:to_hex():upper())
-            ngx.say(params.public:to_hex():upper())
+            ngx.say(params.p:to_hex())
+            ngx.say(params.g:to_hex())
+            ngx.say(params.private:to_hex())
+            ngx.say(params.public:to_hex())
 
             collectgarbage()
         }
@@ -774,11 +773,11 @@ A4D1CBD5C3FD34126765A442EFB99905F8104DD258AC507FD6406CFF14266D31266FEA1E5C41564B
                 param = pem,
             }))
 
-            ngx.say(myassert(p:get_parameters().p:to_hex():upper()))
+            ngx.say(myassert(p:get_parameters().p:to_hex()))
 
             local pem = myassert(require("resty.openssl.pkey").paramgen({
                 type = "EC",
-                curve = "prime256v1",
+                curve = "prime192v1",
             }))
 
             local p = myassert(require("resty.openssl.pkey").new({
@@ -795,7 +794,7 @@ A4D1CBD5C3FD34126765A442EFB99905F8104DD258AC507FD6406CFF14266D31266FEA1E5C41564B
     GET /t
 --- response_body_like eval
 "B10B8F96A080E01DDE92DE5EAE5D54EC52C99FBCFB06A3C69A6A9DCA52D23B616073E28675A23D189838EF1E2EE652C013ECB4AEA906112324975C3CD49B83BFACCBDD7D90C4BD7098488E9C219A73724EFFD6FAE5644738FAA31A4FF55BCCC0A151AF5F0DC8B4BD45BF37DF365C1A65E68CFDA76D4DA708DF1FB2BC2E4A4371
-415
+409
 "
 --- no_error_log
 [error]

t/openssl/version.t

@@ -33,7 +33,7 @@ __DATA__
 --- request
     GET /t
 --- response_body_like
-(OpenSSL \d.\d.\d.+|BoringSSL)
+OpenSSL \d.\d.\d.+
 --- no_error_log
 [error]
 
@@ -50,7 +50,7 @@ __DATA__
 --- request
     GET /t
 --- response_body_like
-(OpenSSL \d.\d.\d.+|BoringSSL)
+OpenSSL \d.\d.\d.+
 compiler:.+
 --- no_error_log
 [error]

t/openssl/x509.t

@@ -63,7 +63,7 @@ __DATA__
 --- request
     GET /t
 --- response_body_like eval
-"x509.new.+(nested asn1 error|NESTED_ASN1_ERROR).+"
+"x509.new.+nested asn1 error.+"
 --- no_error_log
 [error]
 
@@ -87,7 +87,7 @@ __DATA__
 --- request
     GET /t
 --- response_body_like eval
-"x509.new.+(no start line|NO_START_LINE).+"
+"x509.new.+no start line.+"
 --- no_error_log
 [error]
 
@@ -121,7 +121,7 @@ x509.new: .*not enough data.*
             local c = myassert(require("resty.openssl.x509").new(f))
             local dd = myassert(c:digest())
 
-            local h = string.upper(myassert(require("helper").to_hex(dd)))
+            local h = myassert(require("helper").to_hex(dd))
             ngx.say(h)
         }
     }
@@ -142,7 +142,7 @@ x509.new: .*not enough data.*
             local c = myassert(require("resty.openssl.x509").new(f))
             local dd = myassert(c:pubkey_digest())
 
-            local h, err = string.upper(require("helper").to_hex(dd))
+            local h, err = require("helper").to_hex(dd)
             ngx.say(h)
         }
     }
@@ -454,7 +454,7 @@ nil
 --- config
     location =/t {
         content_by_lua_block {
-            local cert, key = require("helper").create_self_signed({ type = "EC", curve = "prime256v1" })
+            local cert, key = require("helper").create_self_signed({ type = "EC" })
             local ok, err = cert:check_private_key(key)
             ngx.say(ok)
             ngx.say(err)
@@ -467,7 +467,6 @@ nil
 
             local key2 = require("resty.openssl.pkey").new({
                 type = 'EC',
-                curve = "prime256v1",
             })
             local ok, err = cert:check_private_key(key2)
             ngx.say(ok)
@@ -498,7 +497,7 @@ false
             local c = myassert(require("resty.openssl.x509").new(f))
 
             local get = myassert(c:get_serial_number())
-            get = get:to_hex():upper()
+            get = get:to_hex()
             ngx.print(get)
         }
     }
@@ -520,8 +519,8 @@ false
             local ok = myassert(c:set_serial_number(toset))
 
             local get = myassert(c:get_serial_number())
-            get = get:to_hex():upper()
-            toset = toset:to_hex():upper()
+            get = get:to_hex()
+            toset = toset:to_hex()
             if get ~= toset then
               ngx.say(get)
               ngx.say(toset)

t/openssl/x509/crl.t

@@ -63,7 +63,7 @@ __DATA__
 --- request
     GET /t
 --- response_body_like eval
-"x509.crl.new.+(nested asn1 error|NESTED_ASN1_ERROR).+"
+"x509.crl.new.+nested asn1 error.+"
 --- no_error_log
 [error]
 
@@ -87,7 +87,7 @@ __DATA__
 --- request
     GET /t
 --- response_body_like eval
-"x509.crl.new.+(no start line|NO_START_LINE).+"
+"x509.crl.new.+no start line.+"
 --- no_error_log
 [error]