aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto/cms/cms_kari.c
Commit message (Collapse)AuthorAgeFilesLines
* Update to openssl-1.0.2cmarha2015-06-221-0/+4
| | | | | Conflicts: openssl/Makefile
* Merged origin/release (checked in because wanted to merge new stuff)marha2015-02-221-0/+461