aboutsummaryrefslogtreecommitdiff
path: root/crypto/pem
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>1999-11-14 23:10:50 +0000
committerDr. Stephen Henson <steve@openssl.org>1999-11-14 23:10:50 +0000
commit06556a1744dced40a2a77d7b6e4bb73f6e611b8d (patch)
tree8d307cf70c140df0db40c469fe3987b57475c21d /crypto/pem
parent4abc5c624abf7ee9675a71f45aa3ce5aad8670c1 (diff)
downloadopenssl-06556a1744dced40a2a77d7b6e4bb73f6e611b8d.zip
openssl-06556a1744dced40a2a77d7b6e4bb73f6e611b8d.tar.gz
openssl-06556a1744dced40a2a77d7b6e4bb73f6e611b8d.tar.bz2
'req' fixes. Reinstate length check one request fields.
Fix to stop null being added to attributes. Modify X509_LOOKUP, X509_INFO to handle auxiliary info.
Diffstat (limited to 'crypto/pem')
-rw-r--r--crypto/pem/pem_info.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c
index fec18a4..b65239a 100644
--- a/crypto/pem/pem_info.c
+++ b/crypto/pem/pem_info.c
@@ -132,6 +132,17 @@ start:
}
pp=(char **)&(xi->x509);
}
+ else if ((strcmp(name,PEM_STRING_X509_TRUSTED) == 0))
+ {
+ d2i=(char *(*)())d2i_X509_AUX;
+ if (xi->x509 != NULL)
+ {
+ if (!sk_X509_INFO_push(ret,xi)) goto err;
+ if ((xi=X509_INFO_new()) == NULL) goto err;
+ goto start;
+ }
+ pp=(char **)&(xi->x509);
+ }
else if (strcmp(name,PEM_STRING_X509_CRL) == 0)
{
d2i=(char *(*)())d2i_X509_CRL;