diff options
| author | Siri Hansen <[email protected]> | 2013-01-23 16:28:19 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-01-23 16:28:19 +0100 |
| commit | f5170af4a992d6de5cd84da9cc4db4b4e073de32 (patch) | |
| tree | b7552d19bfe301a10e23ff031a2c30b0ea5655ab /lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl | |
| parent | d0809964a228c6314a5bb8b5872114a0ab9ec65e (diff) | |
| parent | 4aa7be58e6c1e7031042e7ea7b008de1cf4c0ad6 (diff) | |
| download | otp-f5170af4a992d6de5cd84da9cc4db4b4e073de32.tar.gz otp-f5170af4a992d6de5cd84da9cc4db4b4e073de32.tar.bz2 otp-f5170af4a992d6de5cd84da9cc4db4b4e073de32.zip | |
Merge branch 'siri/common_test/minor_test_fixes/OTP-10483'
* siri/common_test/minor_test_fixes/OTP-10483:
[common_test] Extend timetrap time in ct_hooks_SUITE
[common_test] Avoid hanging ct@host node if crypto does not exist
[common_test] Changed call to publick_key to use documented interface
[common_test] Extend timeout values for slave nodes in ct_master_SUITE
[common_test] Extend valid interval for approximate timer values in tests
Diffstat (limited to 'lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl index d337158bce..54526e8e83 100644 --- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl +++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl @@ -1044,12 +1044,9 @@ gen_dsa(LSize,NSize) when is_integer(LSize), is_integer(NSize) -> Key = gen_dsa2(LSize, NSize), {Key, encode_key(Key)}. -encode_key(Key = #'RSAPrivateKey'{}) -> - {ok, Der} = 'OTP-PUB-KEY':encode('RSAPrivateKey', Key), - {'RSAPrivateKey', list_to_binary(Der), not_encrypted}; encode_key(Key = #'DSAPrivateKey'{}) -> - {ok, Der} = 'OTP-PUB-KEY':encode('DSAPrivateKey', Key), - {'DSAPrivateKey', list_to_binary(Der), not_encrypted}. + Der = public_key:der_encode('DSAPrivateKey', Key), + {'DSAPrivateKey', Der, not_encrypted}. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% |