diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-05-26 15:45:31 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-05-26 15:45:31 +0000 |
| commit | 43660f13d310752c09d2c5a3c345ac15902670a5 (patch) | |
| tree | 1b245f19fa8a5ec4c8787a44f115c246bcfb440a /lib | |
| parent | 914ef8c467927caf7c18511ae17eec541f687edb (diff) | |
| download | otp-43660f13d310752c09d2c5a3c345ac15902670a5.tar.gz otp-43660f13d310752c09d2c5a3c345ac15902670a5.tar.bz2 otp-43660f13d310752c09d2c5a3c345ac15902670a5.zip | |
OTP-8649 change in public_key api
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 744d85dd4b..dc110e2940 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -2484,7 +2484,7 @@ extended_key_usage(Config) when is_list(Config) -> [ServerExtKeyUsageExt | ServerExtensions]}, NewServerDerCert = public_key:sign(NewServerOTPTbsCert, Key), - public_key:der_to_pem(NewServerCertFile, [{cert, NewServerDerCert}]), + public_key:der_to_pem(NewServerCertFile, [{cert, NewServerDerCert, not_encrypted}]), NewServerOpts = [{certfile, NewServerCertFile} | proplists:delete(certfile, ServerOpts)], ClientCertFile = proplists:get_value(certfile, ClientOpts), @@ -2498,7 +2498,7 @@ extended_key_usage(Config) when is_list(Config) -> [ClientExtKeyUsageExt | ClientExtensions]}, NewClientDerCert = public_key:sign(NewClientOTPTbsCert, Key), - public_key:der_to_pem(NewClientCertFile, [{cert, NewClientDerCert}]), + public_key:der_to_pem(NewClientCertFile, [{cert, NewClientDerCert, not_encrypted}]), NewClientOpts = [{certfile, NewClientCertFile} | proplists:delete(certfile, ClientOpts)], {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), @@ -2581,7 +2581,7 @@ no_authority_key_identifier(Config) when is_list(Config) -> test_server:format("Extensions ~p~n, NewExtensions: ~p~n", [Extensions, NewExtensions]), NewDerCert = public_key:sign(NewOTPTbsCert, Key), - public_key:der_to_pem(NewCertFile, [{cert, NewDerCert}]), + public_key:der_to_pem(NewCertFile, [{cert, NewDerCert, not_encrypted}]), NewServerOpts = [{certfile, NewCertFile} | proplists:delete(certfile, ServerOpts)], {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), @@ -2633,7 +2633,7 @@ invalid_signature_server(Config) when is_list(Config) -> {ok, ServerOTPCert} = public_key:pkix_decode_cert(ServerDerCert, otp), ServerOTPTbsCert = ServerOTPCert#'OTPCertificate'.tbsCertificate, NewServerDerCert = public_key:sign(ServerOTPTbsCert, Key), - public_key:der_to_pem(NewServerCertFile, [{cert, NewServerDerCert}]), + public_key:der_to_pem(NewServerCertFile, [{cert, NewServerDerCert, not_encrypted}]), NewServerOpts = [{certfile, NewServerCertFile} | proplists:delete(certfile, ServerOpts)], {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), @@ -2676,7 +2676,7 @@ invalid_signature_client(Config) when is_list(Config) -> {ok, ClientOTPCert} = public_key:pkix_decode_cert(ClientDerCert, otp), ClientOTPTbsCert = ClientOTPCert#'OTPCertificate'.tbsCertificate, NewClientDerCert = public_key:sign(ClientOTPTbsCert, Key), - public_key:der_to_pem(NewClientCertFile, [{cert, NewClientDerCert}]), + public_key:der_to_pem(NewClientCertFile, [{cert, NewClientDerCert, not_encrypted}]), NewClientOpts = [{certfile, NewClientCertFile} | proplists:delete(certfile, ClientOpts)], {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), @@ -2739,7 +2739,7 @@ cert_expired(Config) when is_list(Config) -> NewOTPTbsCert = OTPTbsCert#'OTPTBSCertificate'{validity = NewValidity}, NewServerDerCert = public_key:sign(NewOTPTbsCert, Key), - public_key:der_to_pem(NewServerCertFile, [{cert, NewServerDerCert}]), + public_key:der_to_pem(NewServerCertFile, [{cert, NewServerDerCert, not_encrypted}]), NewServerOpts = [{certfile, NewServerCertFile} | proplists:delete(certfile, ServerOpts)], {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), |