aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-06-17 09:52:22 +0200
committerIngela Anderton Andin <[email protected]>2016-06-17 09:52:22 +0200
commitbd1dd3cdba13da97cc84ac0dc69ed772f3878c74 (patch)
tree218fdd8e43f73c17ee7e9fa781713c3df33bcd83 /lib/ssl
parent29864ba25d395aa57b88cd9d4357aa5a935b7535 (diff)
parentbfea08c61b6f46104eef2a573ed5d249c0508299 (diff)
downloadotp-bd1dd3cdba13da97cc84ac0dc69ed772f3878c74.tar.gz
otp-bd1dd3cdba13da97cc84ac0dc69ed772f3878c74.tar.bz2
otp-bd1dd3cdba13da97cc84ac0dc69ed772f3878c74.zip
Merge branch 'shlonny/add-asn1-app-to-ssl-distribution-doc/PR-1101'
* shlonny/add-asn1-app-to-ssl-distribution-doc/PR-1101: added asn1 to applications needed for start_ssl
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/doc/src/ssl_distribution.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssl/doc/src/ssl_distribution.xml b/lib/ssl/doc/src/ssl_distribution.xml
index 495e02d271..4bd5f67202 100644
--- a/lib/ssl/doc/src/ssl_distribution.xml
+++ b/lib/ssl/doc/src/ssl_distribution.xml
@@ -98,6 +98,7 @@
{stdlib,"1.18"},
{crypto, "2.0.3"},
{public_key, "0.12"},
+ {asn1, "4.0"},
{ssl, "5.0"}
]}.
</code>