diff options
author | Ingela Anderton Andin <[email protected]> | 2013-03-13 14:48:35 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2013-03-13 14:48:35 +0100 |
commit | 56207dab54862aee071db6f911ad3a447f1cab8f (patch) | |
tree | a24b52b521fbe54e2c9a8df3da6e3efdd9a03a07 /lib/ssl/src/ssl.app.src | |
parent | 9285e0f558b1f39a241431e46691841bc0284d57 (diff) | |
parent | 006f45a738a6612958381b2fcbf48586c008d911 (diff) | |
download | otp-56207dab54862aee071db6f911ad3a447f1cab8f.tar.gz otp-56207dab54862aee071db6f911ad3a447f1cab8f.tar.bz2 otp-56207dab54862aee071db6f911ad3a447f1cab8f.zip |
Merge branch 'ia/public_key/ISO-oids/OTP-10873' into maint
* ia/public_key/ISO-oids/OTP-10873:
public_key & ssl: Add support for ISO oids 1.3.14.3.2.29 and 1.3.14.3.2.27
Diffstat (limited to 'lib/ssl/src/ssl.app.src')
0 files changed, 0 insertions, 0 deletions