aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-04-08 09:21:36 +0200
committerIngela Anderton Andin <[email protected]>2013-04-08 09:21:36 +0200
commita4a619fa50de7f49cfb64867ed242295ff417150 (patch)
tree4f09ffe34ebfa2e316bae867a87b4db69fcd97f2
parentfea6a84a9a08902fea79085e135f6e53986c02a2 (diff)
parent36bb8d80364d45038bdd8de96601e24fb8d6d4ce (diff)
downloadotp-a4a619fa50de7f49cfb64867ed242295ff417150.tar.gz
otp-a4a619fa50de7f49cfb64867ed242295ff417150.tar.bz2
otp-a4a619fa50de7f49cfb64867ed242295ff417150.zip
Merge remote branch 'upstream/maint'
-rwxr-xr-xlib/crypto/doc/src/crypto.xml18
-rw-r--r--lib/ssl/doc/src/ssl.xml4
2 files changed, 12 insertions, 10 deletions
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() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
<fsummary>Generates SRP public keys</fsummary>
<type>
<v>Verifier = binary()</v>
- <d>Parameter v from <seealso marker="http://srp.stanford.edu/design.html">SRP design</seealso>
+ <d>Parameter v from <url href="http://srp.stanford.edu/design.html">SRP design</url>
</d>
<v>Generator = binary() </v>
- <d>Parameter g from <seealso marker="http://srp.stanford.edu/design.html">SRP design</seealso>
+ <d>Parameter g from <url href="http://srp.stanford.edu/design.html">SRP design</url>
</d>
<v>Prime = binary() </v>
- <d>Parameter N from <seealso marker="http://srp.stanford.edu/design.html">SRP design</seealso>
+ <d>Parameter N from <url href="http://srp.stanford.edu/design.html">SRP design</url>
</d>
<v>Version = '3' | '6' | '6a' </v>
<d>SRP version, TLS SRP cipher suites uses '6a'.</d>
<v>PublicKey = binary()</v>
- <d> Parameter A or B from <seealso marker="http://srp.stanford.edu/design.html">SRP design</seealso></d>
- <v>PrivateKey = binary() - generated if not supplied</v>
- <d>Parameter a or b from <seealso marker="http://srp.stanford.edu/design.html">SRP design</seealso></d>
+ <d> Parameter A or B from <url href="http://srp.stanford.edu/design.html">SRP design</url></d>
+ <v>Private = PrivateKey = binary() - generated if not supplied</v>
+ <d>Parameter a or b from <url href="http://srp.stanford.edu/design.html">SRP design</url></d>
</type>
<desc>
- <p>Generates SRP public keys</p>
+ <p>Generates SRP public keys for the client side (first argument is Generator)
+ or for the server side (first argument is Verifier).</p>
</desc>
</func>
@@ -1351,7 +1352,8 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
</type>
<desc>
<p>
- 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.
</p>
</desc>
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()} |
<item>
<p>The lookup fun should be defined as:</p>
<code>
-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.
</code>