diff options
author | Ingela Anderton Andin <[email protected]> | 2012-11-16 10:25:55 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2012-11-16 10:25:55 +0100 |
commit | 9aa4de3c97b98974f32c2b8e07c971343faf3f13 (patch) | |
tree | 19e1b2574a6d27f32c59a343049abfa1ebd41809 /make/otp.mk.in | |
parent | 7a637b67d2c97ed682fb338f66ec9aabbf8d47c9 (diff) | |
parent | 1180643da5bedf3b3b50ef9c25c361c1c2be7316 (diff) | |
download | otp-9aa4de3c97b98974f32c2b8e07c971343faf3f13.tar.gz otp-9aa4de3c97b98974f32c2b8e07c971343faf3f13.tar.bz2 otp-9aa4de3c97b98974f32c2b8e07c971343faf3f13.zip |
Merge branch 'ia/public_key/Additional-PKCS-support/OTP-10509' into maint
* ia/public_key/Additional-PKCS-support/OTP-10509:
Prepare for release
public_key: Add PKCS-10 documentation and PKCS-7 test case
public_key: Simplified PKCS-7 and PKCS-10 specs.
public_key: Added PKCS-10
public_key: Modified PKCS-7.asn1, removing unnecessary IMPORTS.
public_key: Add PKCS-7
Diffstat (limited to 'make/otp.mk.in')
0 files changed, 0 insertions, 0 deletions