diff options
author | Henrik Nord <[email protected]> | 2014-02-24 16:14:16 +0100 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2014-02-24 16:14:44 +0100 |
commit | 109a06739bdbb5ca1e21cea2d4cf288fc0848d57 (patch) | |
tree | 25abfecf02dfb64fa2e5c0d8d47fce5c739e95cf /lib/ssl/src/ssl_pkix_db.erl | |
parent | ca693a05bda78d701ff8b47d851505098c79c077 (diff) | |
parent | f2169928a77d5a6b2e3e069b8cf9b8f5300ed543 (diff) | |
download | otp-109a06739bdbb5ca1e21cea2d4cf288fc0848d57.tar.gz otp-109a06739bdbb5ca1e21cea2d4cf288fc0848d57.tar.bz2 otp-109a06739bdbb5ca1e21cea2d4cf288fc0848d57.zip |
Merge branch 'fenollp/otp-edoc-usage-fixes'
* fenollp/otp-edoc-usage-fixes:
Fix edoc usage errors
OTP-11702
Diffstat (limited to 'lib/ssl/src/ssl_pkix_db.erl')
-rw-r--r-- | lib/ssl/src/ssl_pkix_db.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_pkix_db.erl b/lib/ssl/src/ssl_pkix_db.erl index 9de50c8f26..e59aba0618 100644 --- a/lib/ssl/src/ssl_pkix_db.erl +++ b/lib/ssl/src/ssl_pkix_db.erl @@ -115,17 +115,17 @@ add_trusted_certs(_Pid, File, [CertsDb, RefDb, PemChache] = Db) -> new_trusted_cert_entry({MD5, File}, Db) end. %%-------------------------------------------------------------------- --spec cache_pem_file({binary(), binary()}, [db_handle()]) -> {ok, term()}. --spec cache_pem_file(reference(), {binary(), binary()}, [db_handle()]) -> {ok, term()}. %% %% Description: Cache file as binary in DB %%-------------------------------------------------------------------- +-spec cache_pem_file({binary(), binary()}, [db_handle()]) -> {ok, term()}. cache_pem_file({MD5, File}, [_CertsDb, _RefDb, PemChache]) -> {ok, PemBin} = file:read_file(File), Content = public_key:pem_decode(PemBin), insert(MD5, Content, PemChache), {ok, Content}. +-spec cache_pem_file(reference(), {binary(), binary()}, [db_handle()]) -> {ok, term()}. cache_pem_file(Ref, {MD5, File}, [_CertsDb, _RefDb, PemChache]) -> {ok, PemBin} = file:read_file(File), Content = public_key:pem_decode(PemBin), |