Skip to content

Commit 762bdb1

Browse files
anakinjanakinj
committed
Use string keys
1 parent ff7831b commit 762bdb1

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

‎test/openssl/test_pkey.rb‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,9 @@ def test_from_data_with_invalid_alg
253253
end
254254

255255
def test_s_from_data_rsa_with_n_e_and_d_given_as_integers
256-
new_key = OpenSSL::PKey.from_data("RSA", n: 3161751493,
257-
e: 65537,
258-
d: 2064855961)
256+
new_key = OpenSSL::PKey.from_data("RSA", "n" => 3161751493,
257+
"e" => 65537,
258+
"d" => 2064855961)
259259

260260
assert_instance_of OpenSSL::PKey::RSA, new_key
261261
assert_equal true, new_key.private?
@@ -264,10 +264,10 @@ def test_s_from_data_rsa_with_n_e_and_d_given_as_integers
264264
assert_equal OpenSSL::BN.new(2064855961), new_key.d
265265
end
266266

267-
def test_s_from_data_rsa_with_n_e_and_d_given_as_strings
268-
new_key = OpenSSL::PKey.from_data("RSA", "n" => OpenSSL::BN.new(3161751493),
269-
"e" => OpenSSL::BN.new(65537),
270-
"d" => OpenSSL::BN.new(2064855961))
267+
def test_s_from_data_rsa_with_n_e_and_d_given_as_symbols
268+
new_key = OpenSSL::PKey.from_data("RSA", n: OpenSSL::BN.new(3161751493),
269+
e: OpenSSL::BN.new(65537),
270+
d: OpenSSL::BN.new(2064855961))
271271

272272
assert_instance_of OpenSSL::PKey::RSA, new_key
273273
assert_equal true, new_key.private?
@@ -277,8 +277,8 @@ def test_s_from_data_rsa_with_n_e_and_d_given_as_strings
277277
end
278278

279279
def test_s_from_data_rsa_with_n_and_e_given
280-
new_key = OpenSSL::PKey.from_data("RSA", n: OpenSSL::BN.new(3161751493),
281-
e: OpenSSL::BN.new(65537))
280+
new_key = OpenSSL::PKey.from_data("RSA", "n" => OpenSSL::BN.new(3161751493),
281+
"e" => OpenSSL::BN.new(65537))
282282

283283
assert_instance_of OpenSSL::PKey::RSA, new_key
284284
assert_equal false, new_key.private?
@@ -289,9 +289,9 @@ def test_s_from_data_rsa_with_n_and_e_given
289289

290290
def test_s_from_data_rsa_with_openssl_internal_names
291291
source = Fixtures.pkey("rsa2048")
292-
new_key = OpenSSL::PKey.from_data("RSA", n: source.n,
293-
e: source.e,
294-
d: source.d,
292+
new_key = OpenSSL::PKey.from_data("RSA", "n" => source.n,
293+
"e" => source.e,
294+
"d" => source.d,
295295
"rsa-factor1" => source.p,
296296
"rsa-factor2" => source.q,
297297
"rsa-exponent1" => source.dmp1,
@@ -311,14 +311,14 @@ def test_s_from_data_rsa_with_openssl_internal_names
311311

312312
def test_s_from_data_rsa_with_simple_names
313313
source = Fixtures.pkey("rsa2048")
314-
new_key = OpenSSL::PKey.from_data("RSA", n: source.n,
315-
e: source.e,
316-
d: source.d,
317-
p: source.p,
318-
q: source.q,
319-
dmp1: source.dmp1,
320-
dmq1: source.dmq1,
321-
iqmp: source.iqmp)
314+
new_key = OpenSSL::PKey.from_data("RSA", "n" => source.n,
315+
"e" => source.e,
316+
"d" => source.d,
317+
"p" => source.p,
318+
"q" => source.q,
319+
"dmp1" => source.dmp1,
320+
"dmq1" => source.dmq1,
321+
"iqmp" => source.iqmp)
322322

323323
assert_equal source.n, new_key.n
324324
assert_equal source.e, new_key.e
@@ -333,14 +333,14 @@ def test_s_from_data_rsa_with_simple_names
333333

334334
def test_s_from_data_rsa_with_invalid_parameter
335335
assert_raise_with_message(OpenSSL::PKey::PKeyError, /Invalid parameter "invalid"/) do
336-
OpenSSL::PKey.from_data("RSA", invalid: 1234)
336+
OpenSSL::PKey.from_data("RSA", "invalid" => 1234)
337337
end
338338
end
339339

340340
def test_s_from_data_ec_pub_given_as_string
341341
source = Fixtures.pkey("ec-prime256v1")
342-
new_key = OpenSSL::PKey.from_data("EC", group: source.group.curve_name,
343-
pub: source.public_key.to_bn.to_s(2))
342+
new_key = OpenSSL::PKey.from_data("EC", "group" => source.group.curve_name,
343+
"pub" => source.public_key.to_bn.to_s(2))
344344
assert_instance_of OpenSSL::PKey::EC, new_key
345345
assert_equal source.group.curve_name, new_key.group.curve_name
346346
assert_equal source.public_key, new_key.public_key
@@ -349,8 +349,8 @@ def test_s_from_data_ec_pub_given_as_string
349349

350350
def test_s_from_data_ec_priv_given_as_bn
351351
source = Fixtures.pkey("ec-prime256v1")
352-
new_key = OpenSSL::PKey.from_data("EC", group: source.group.curve_name,
353-
priv: source.private_key.to_bn)
352+
new_key = OpenSSL::PKey.from_data("EC", "group" => source.group.curve_name,
353+
"priv" => source.private_key.to_bn)
354354
assert_instance_of OpenSSL::PKey::EC, new_key
355355
assert_equal source.group.curve_name, new_key.group.curve_name
356356
assert_equal source.private_key, new_key.private_key
@@ -359,8 +359,8 @@ def test_s_from_data_ec_priv_given_as_bn
359359

360360
def test_s_from_data_ec_priv_given_as_integer
361361
source = Fixtures.pkey("ec-prime256v1")
362-
new_key = OpenSSL::PKey.from_data("EC", group: source.group.curve_name,
363-
priv: source.private_key.to_i)
362+
new_key = OpenSSL::PKey.from_data("EC", "group" => source.group.curve_name,
363+
"priv" => source.private_key.to_i)
364364
assert_instance_of OpenSSL::PKey::EC, new_key
365365
assert_equal source.group.curve_name, new_key.group.curve_name
366366
assert_equal source.private_key, new_key.private_key
@@ -371,9 +371,9 @@ def test_s_from_data_ec_priv_and_pub_given_for_different_curves
371371
[Fixtures.pkey("ec-prime256v1"),
372372
Fixtures.pkey("ec-secp384r1"),
373373
Fixtures.pkey("ec-secp521r1")].each do |source|
374-
new_key = OpenSSL::PKey.from_data("EC", group: source.group.curve_name,
375-
pub: source.public_key.to_bn.to_s(2),
376-
priv: source.private_key.to_i)
374+
new_key = OpenSSL::PKey.from_data("EC", "group" => source.group.curve_name,
375+
"pub" => source.public_key.to_bn.to_s(2),
376+
"priv" => source.private_key.to_i)
377377
assert_instance_of OpenSSL::PKey::EC, new_key
378378
assert_equal source.group.curve_name, new_key.group.curve_name
379379
assert_equal source.private_key, new_key.private_key
@@ -383,23 +383,23 @@ def test_s_from_data_ec_priv_and_pub_given_for_different_curves
383383

384384
def test_s_from_data_ec_pub_given_as_integer
385385
assert_raise_with_message(TypeError, "no implicit conversion of Integer into String") do
386-
OpenSSL::PKey.from_data("EC", { group: "prime256v1", pub: 12345 })
386+
OpenSSL::PKey.from_data("EC", { "group" => "prime256v1", "pub" => 12345 })
387387
end
388388
end
389389

390390
def test_s_from_data_ec_with_invalid_parameter
391391
assert_raise_with_message(OpenSSL::PKey::PKeyError, /Invalid parameter "invalid"/) do
392-
OpenSSL::PKey.from_data("EC", invalid: 1234)
392+
OpenSSL::PKey.from_data("EC", "invalid" => 1234)
393393
end
394394
end
395395

396396
def test_s_from_data_dsa_with_all_supported_parameters
397397
source = Fixtures.pkey("dsa1024")
398-
new_key = OpenSSL::PKey.from_data("DSA", pub: source.params["pub_key"],
399-
priv: source.params["priv_key"],
400-
p: source.params["p"],
401-
q: source.params["q"],
402-
g: source.params["g"])
398+
new_key = OpenSSL::PKey.from_data("DSA", "pub" => source.params["pub_key"],
399+
"priv" => source.params["priv_key"],
400+
"p" => source.params["p"],
401+
"q" => source.params["q"],
402+
"g" => source.params["g"])
403403

404404
assert_instance_of OpenSSL::PKey::DSA, new_key
405405
assert_equal source.params, new_key.params
@@ -414,7 +414,7 @@ def test_s_from_data_dsa_with_gem_specific_keys
414414

415415
def test_s_from_data_dsa_with_invalid_parameter
416416
assert_raise_with_message(OpenSSL::PKey::PKeyError, /Invalid parameter "invalid". Supported parameters: p, q, g, j/) do
417-
OpenSSL::PKey.from_data("DSA", invalid: 1234)
417+
OpenSSL::PKey.from_data("DSA", "invalid" => 1234)
418418
end
419419
end
420420

@@ -428,7 +428,7 @@ def test_s_from_data_dh_with_all_supported_parameters
428428

429429
def test_s_from_data_dh_with_invalid_parameter
430430
assert_raise_with_message(OpenSSL::PKey::PKeyError, /Invalid parameter "invalid"/) do
431-
OpenSSL::PKey.from_data("DH", invalid: 1234)
431+
OpenSSL::PKey.from_data("DH", "invalid" => 1234)
432432
end
433433
end
434434

@@ -442,7 +442,7 @@ def test_s_from_data_ed25519
442442
-----END PUBLIC KEY-----
443443
EOF
444444

445-
key = OpenSSL::PKey.from_data("ED25519", pub: "\xD0\x8E\xA8\x96\xB6Fbi{$k\xAC\xB8\xA2V\xF4n\xC3\xD06}R\x8A\xE6I\xA7r\xF6D{W\x84")
445+
key = OpenSSL::PKey.from_data("ED25519", "pub" => "\xD0\x8E\xA8\x96\xB6Fbi{$k\xAC\xB8\xA2V\xF4n\xC3\xD06}R\x8A\xE6I\xA7r\xF6D{W\x84")
446446
assert_instance_of OpenSSL::PKey::PKey, key
447447
assert_equal pub_pem, key.public_to_pem
448448
end

0 commit comments

Comments
 (0)