Browse Source

follow upstream public_key api changes

Anton Lebedevich 14 years ago
parent
commit
ae91717fde
1 changed files with 6 additions and 5 deletions
  1. 6 5
      test_src/pgsql_tests.erl

+ 6 - 5
test_src/pgsql_tests.erl

@@ -3,7 +3,7 @@
 -export([run_tests/0]).
 -export([run_tests/0]).
 
 
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("eunit/include/eunit.hrl").
--include_lib("ssl/include/OTP-PKIX.hrl").
+-include_lib("public_key/include/public_key.hrl").
 -include("pgsql.hrl").
 -include("pgsql.hrl").
 
 
 -define(host, "localhost").
 -define(host, "localhost").
@@ -48,7 +48,7 @@ connect_with_invalid_password_test() ->
 
 
 
 
 connect_with_ssl_test() ->
 connect_with_ssl_test() ->
-    lists:foreach(fun application:start/1, [crypto, ssl]),
+    lists:foreach(fun application:start/1, [crypto, public_key, ssl]),
     with_connection(
     with_connection(
       fun(C) ->
       fun(C) ->
               {ok, _Cols, [{true}]} = pgsql:equery(C, "select ssl_is_used()")
               {ok, _Cols, [{true}]} = pgsql:equery(C, "select ssl_is_used()")
@@ -57,12 +57,13 @@ connect_with_ssl_test() ->
       [{ssl, true}]).
       [{ssl, true}]).
 
 
 connect_with_client_cert_test() ->
 connect_with_client_cert_test() ->
-    lists:foreach(fun application:start/1, [crypto, ssl]),
+    lists:foreach(fun application:start/1, [crypto, public_key, ssl]),
 
 
     Dir = filename:join(filename:dirname(code:which(pgsql_tests)), "../test_data"),
     Dir = filename:join(filename:dirname(code:which(pgsql_tests)), "../test_data"),
     File = fun(Name) -> filename:join(Dir, Name) end,
     File = fun(Name) -> filename:join(Dir, Name) end,
-    {ok, [{cert, Der, _}]} = public_key:pem_to_der(File("epgsql.crt")),
-    {ok, Cert} = public_key:pkix_decode_cert(Der, plain),
+    {ok, CertBin} = file:read_file(File("epgsql.crt")),
+    [{'Certificate', Der, _}] = public_key:pem_decode(CertBin),
+    Cert = public_key:pkix_decode_cert(Der, plain),
     #'TBSCertificate'{serialNumber = Serial} = Cert#'Certificate'.tbsCertificate,
     #'TBSCertificate'{serialNumber = Serial} = Cert#'Certificate'.tbsCertificate,
     Serial2 = list_to_binary(integer_to_list(Serial)),
     Serial2 = list_to_binary(integer_to_list(Serial)),