summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src/crypto/asn1/t_spki.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* resolve conflicts, fix local changesdjm2010-10-011-28/+3
* resolve conflictsdjm2009-01-091-1/+1
* resolve conflictsdjm2008-09-061-0/+16
* OpenSSL 0.9.7 stable 2002 05 08 mergebeck2002-05-151-3/+3
* OpenSSL 0.9.5 mergebeck2000-03-191-0/+116