diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-09-03 16:00:09 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-09-03 16:00:09 +0200 |
| commit | e752dcdefda84291cf819036a600b983326dae25 (patch) | |
| tree | 3362174fe3ad7d7d5c9c98ae45b6a4a215c2adbf /lib/ssl/src/ssl_internal.hrl | |
| parent | ec806e4ac537b48241530a397b839117b75708dc (diff) | |
| parent | 1798dbcd3fe62d178d2150105f8c5a8f61dcbedb (diff) | |
| download | otp-e752dcdefda84291cf819036a600b983326dae25.tar.gz otp-e752dcdefda84291cf819036a600b983326dae25.tar.bz2 otp-e752dcdefda84291cf819036a600b983326dae25.zip | |
Merge branch 'ia/ssl-DER-input/OTP-8723' into dev
* ia/ssl-DER-input/OTP-8723:
DER format in API
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index 337403531e..3862dc75de 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -63,9 +63,11 @@ validate_extensions_fun, depth, % integer() certfile, % file() + cert, % der_encoded() keyfile, % file() - key, % + key, % der_encoded() password, % + cacerts, % [der_encoded()] cacertfile, % file() dhfile, % file() ciphers, % |