From c8ecc846b24a82d010bc73e7b559c0903e332af8 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Fri, 5 Apr 2013 12:21:59 +0200 Subject: ssl & crypto: Documentation enhancements OTP-10450 --- lib/crypto/doc/src/crypto.xml | 18 ++++++++++-------- lib/ssl/doc/src/ssl.xml | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml index f30a058ca4..29fc885152 100755 --- a/lib/crypto/doc/src/crypto.xml +++ b/lib/crypto/doc/src/crypto.xml @@ -1287,23 +1287,24 @@ Mpint() = >]]> Generates SRP public keys Verifier = binary() - Parameter v from SRP design + Parameter v from SRP design Generator = binary() - Parameter g from SRP design + Parameter g from SRP design Prime = binary() - Parameter N from SRP design + Parameter N from SRP design Version = '3' | '6' | '6a' SRP version, TLS SRP cipher suites uses '6a'. PublicKey = binary() - Parameter A or B from SRP design - PrivateKey = binary() - generated if not supplied - Parameter a or b from SRP design + Parameter A or B from SRP design + Private = PrivateKey = binary() - generated if not supplied + Parameter a or b from SRP design -

Generates SRP public keys

+

Generates SRP public keys for the client side (first argument is Generator) + or for the server side (first argument is Verifier).

@@ -1351,7 +1352,8 @@ Mpint() = >]]>

- Computes the SRP session key (shared secret). Also used + Computes the SRP session key (shared secret) for the client side (first argument is DerivedKey) + or for the server side (first argument is Verifier). Also used as premaster secret by TLS-SRP ciher suites.

diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index 2501db858a..d5615fecfc 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -305,9 +305,9 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |

The lookup fun should be defined as:

-fun(psk, PSKIdentity, UserState :: term()) -> +fun(psk, PSKIdentity ::string(), UserState :: term()) -> {ok, SharedSecret :: binary()} | error; -fun(srp, Username, UserState :: term()) -> +fun(srp, Username :: string(), UserState :: term()) -> {ok, {SRPParams :: srp_param_type(), Salt :: binary(), DerivedKey :: binary()}} | error. -- cgit v1.2.3