aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-03-23 15:12:23 +0100
committerIngela Anderton Andin <[email protected]>2017-03-23 15:12:23 +0100
commit84be7e0ec7c0c64f1beb418cdd09879822aca4b0 (patch)
treedd8aef05c16018cb09d62e3331ba164df71094e4 /lib/public_key
parentdae0ee2186affe46d881f7662f73361b26f38b68 (diff)
parent9f4c3f973e44ee5784d1d7eddf225ca0458f4525 (diff)
downloadotp-84be7e0ec7c0c64f1beb418cdd09879822aca4b0.tar.gz
otp-84be7e0ec7c0c64f1beb418cdd09879822aca4b0.tar.bz2
otp-84be7e0ec7c0c64f1beb418cdd09879822aca4b0.zip
Merge branch 'ingela/ssl/make-cert-test-data/OTP-14294'
* ingela/ssl/make-cert-test-data/OTP-14294: ssl, public_key: Add functionality for generating X509 cert test data
Diffstat (limited to 'lib/public_key')
-rw-r--r--lib/public_key/src/public_key.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index 8f185bbbd4..965606045d 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -610,7 +610,7 @@ pkix_match_dist_point(#'CertificateList'{
%%--------------------------------------------------------------------
-spec pkix_sign(#'OTPTBSCertificate'{},
- rsa_private_key() | dsa_private_key()) -> Der::binary().
+ rsa_private_key() | dsa_private_key() | ec_private_key()) -> Der::binary().
%%
%% Description: Sign a pkix x.509 certificate. Returns the corresponding
%% der encoded 'Certificate'{}