aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_certificate.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2010-06-23 14:19:21 +0200
committerIngela Anderton Andin <[email protected]>2010-06-23 14:19:21 +0200
commit80e96ac836975c537ebbb7588cce9390775e20db (patch)
tree2fc6723fb72128b1961d219c6b3d26af623d312a /lib/ssl/src/ssl_certificate.erl
parent74b227c22f05d0580a03d1d5f7fefcb12a18bde5 (diff)
downloadotp-80e96ac836975c537ebbb7588cce9390775e20db.tar.gz
otp-80e96ac836975c537ebbb7588cce9390775e20db.tar.bz2
otp-80e96ac836975c537ebbb7588cce9390775e20db.zip
Added more specs and changed from using own min/2 funtion to erlang:min/2.
Diffstat (limited to 'lib/ssl/src/ssl_certificate.erl')
-rw-r--r--lib/ssl/src/ssl_certificate.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_certificate.erl b/lib/ssl/src/ssl_certificate.erl
index be2a6e7ad2..8a79f75725 100644
--- a/lib/ssl/src/ssl_certificate.erl
+++ b/lib/ssl/src/ssl_certificate.erl
@@ -47,8 +47,8 @@
%%====================================================================
%%--------------------------------------------------------------------
--spec trusted_cert_and_path([binary()], certdb_ref(), boolean()) ->
- {binary(), [binary()], list()}.
+-spec trusted_cert_and_path([der_cert()], certdb_ref(), boolean()) ->
+ {der_cert(), [der_cert()], list()}.
%%
%% Description: Extracts the root cert (if not presents tries to
%% look it up, if not found {bad_cert, unknown_ca} will be added verification
@@ -94,7 +94,7 @@ trusted_cert_and_path(CertChain, CertDbRef, Verify) ->
%%--------------------------------------------------------------------
-spec certificate_chain(undefined | binary(), certdb_ref()) ->
- {error, no_cert} | [binary()].
+ {error, no_cert} | [der_cert()].
%%
%% Description: Return the certificate chain to send to peer.
%%--------------------------------------------------------------------
@@ -104,7 +104,7 @@ certificate_chain(OwnCert, CertsDbRef) ->
{ok, ErlCert} = public_key:pkix_decode_cert(OwnCert, otp),
certificate_chain(ErlCert, OwnCert, CertsDbRef, [OwnCert]).
%%--------------------------------------------------------------------
--spec file_to_certificats(string()) -> [binary()].
+-spec file_to_certificats(string()) -> [der_cert()].
%%
%% Description: Return list of DER encoded certificates.
%%--------------------------------------------------------------------