aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/doc
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-04-18 15:16:04 +0200
committerSverker Eriksson <[email protected]>2016-04-18 15:16:04 +0200
commit77c3110b00d7f5e80ca1da77df79650e2fa66efe (patch)
tree3d2adb583f71535749b7aadfe9f62074ab3c4a34 /lib/crypto/doc
parent6aa696eb58127f3da12ad1640347fd5c285954a6 (diff)
parentb3d2334d78fe23502b81ae095617fb585d0ba3c3 (diff)
downloadotp-77c3110b00d7f5e80ca1da77df79650e2fa66efe.tar.gz
otp-77c3110b00d7f5e80ca1da77df79650e2fa66efe.tar.bz2
otp-77c3110b00d7f5e80ca1da77df79650e2fa66efe.zip
Merge branch 'mururu/crypto/aes-gcm-tag-len.PR-998.OTP-13483'
Diffstat (limited to 'lib/crypto/doc')
-rw-r--r--lib/crypto/doc/src/crypto.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 60fdc627fd..e0b989436f 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -203,6 +203,7 @@
<func>
<name>block_encrypt(Type, Key, Ivec, PlainText) -> CipherText</name>
<name>block_encrypt(AeadType, Key, Ivec, {AAD, PlainText}) -> {CipherText, CipherTag}</name>
+ <name>block_encrypt(aes_gcm, Key, Ivec, {AAD, PlainText, TagLength}) -> {CipherText, CipherTag}</name>
<fsummary>Encrypt <c>PlainText</c> according to <c>Type</c> block cipher</fsummary>
<type>
<v>Type = block_cipher() </v>
@@ -210,6 +211,7 @@
<v>Key = block_key() </v>
<v>PlainText = iodata() </v>
<v>AAD = IVec = CipherText = CipherTag = binary()</v>
+ <v>TagLength = 1..16</v>
</type>
<desc>
<p>Encrypt <c>PlainText</c> according to <c>Type</c> block cipher.