aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-09-30 13:27:30 +0200
committerHenrik Nord <[email protected]>2015-09-30 13:27:30 +0200
commit382b1fde9f28090a41344d4e66bdbd5a1f4a7327 (patch)
treed70220446cd0b2337e6f6976ae2c36355f836230 /lib/crypto
parent93b506afd35cc9edeebbad5da0c1624e2d3c0d92 (diff)
parent46178552c4622b29d5a70ca23d945e9036caa437 (diff)
downloadotp-382b1fde9f28090a41344d4e66bdbd5a1f4a7327.tar.gz
otp-382b1fde9f28090a41344d4e66bdbd5a1f4a7327.tar.bz2
otp-382b1fde9f28090a41344d4e66bdbd5a1f4a7327.zip
Merge branch 'maint'
Diffstat (limited to 'lib/crypto')
-rw-r--r--lib/crypto/doc/src/crypto.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 385a583883..291a5145e4 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -617,7 +617,7 @@
RAND_seed function from openssl. Only use this if the system
you are running on does not have enough "randomness" built in.
Normally this is when <seealso marker="#strong_rand_bytes/1">
- stong_rand_bytes/1</seealso> returns <c>low_entropy</c></p>
+ strong_rand_bytes/1</seealso> returns <c>low_entropy</c></p>
</desc>
</func>
@@ -710,7 +710,7 @@
</type>
<desc>
<p>Initializes the state for use in streaming AES encryption using Counter mode (CTR).
- <c>Key</c> is the AES key and must be either 128, 192, or 256 bts long. <c>IVec</c> is
+ <c>Key</c> is the AES key and must be either 128, 192, or 256 bits long. <c>IVec</c> is
an arbitrary initializing vector of 128 bits (16 bytes). This state is for use with
<seealso marker="#stream_encrypt-2">stream_encrypt</seealso> and
<seealso marker="#stream_decrypt-2">stream_decrypt</seealso>.</p>