aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_certificate.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2010-09-17 15:17:43 +0200
committerIngela Anderton Andin <[email protected]>2010-09-17 15:17:43 +0200
commitc1eb8a0b776634422cd9fe3cf6083d25d5b568d0 (patch)
tree786eeebe45746edae1ae5fca3b448e7996d85f8c /lib/ssl/src/ssl_certificate.erl
parentb915bb2da3e5f507439df3ee8e259fb0a9bc424e (diff)
parent6a933540f24e76c05cc652acbf2aa92b9ab76d58 (diff)
downloadotp-c1eb8a0b776634422cd9fe3cf6083d25d5b568d0.tar.gz
otp-c1eb8a0b776634422cd9fe3cf6083d25d5b568d0.tar.bz2
otp-c1eb8a0b776634422cd9fe3cf6083d25d5b568d0.zip
Merge branch 'ia/fix-dialyzer-specs' into dev
* ia/fix-dialyzer-specs: Corrected and added dialyzer specs
Diffstat (limited to 'lib/ssl/src/ssl_certificate.erl')
-rw-r--r--lib/ssl/src/ssl_certificate.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_certificate.erl b/lib/ssl/src/ssl_certificate.erl
index 206024315e..d2ab21657c 100644
--- a/lib/ssl/src/ssl_certificate.erl
+++ b/lib/ssl/src/ssl_certificate.erl
@@ -110,9 +110,10 @@ file_to_certificats(File) ->
{ok, List} = ssl_manager:cache_pem_file(File),
[Bin || {'Certificate', Bin, not_encrypted} <- List].
%%--------------------------------------------------------------------
--spec validate_extension(term(), #'Extension'{}, term()) -> {valid, term()} |
- {fail, tuple()} |
- {unknown, term()}.
+-spec validate_extension(term(), #'Extension'{} | {bad_cert, atom()} | valid,
+ term()) -> {valid, term()} |
+ {fail, tuple()} |
+ {unknown, term()}.
%%
%% Description: Validates ssl/tls specific extensions
%%--------------------------------------------------------------------