Discuss http://www.shoup.net/papers/oaep.ps.Z

[openssl.git] / crypto / pem / pem_info.c

diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c
index fec18a4c2ed6bc012ba1a980d9e217d242eed4a7..1c5c6dea000e14a2c912689b7a20fa12dd469ec1 100644 (file)
--- 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;
@@ -226,9 +237,9 @@ start:
                else    {
                        /* unknown */
                        }
-               if (name != NULL) Free(name);
-               if (header != NULL) Free(header);
-               if (data != NULL) Free(data);
+               if (name != NULL) OPENSSL_free(name);
+               if (header != NULL) OPENSSL_free(header);
+               if (data != NULL) OPENSSL_free(data);
                name=NULL;
                header=NULL;
                data=NULL;
@@ -257,9 +268,9 @@ err:
                ret=NULL;
                }
                
-       if (name != NULL) Free(name);
-       if (header != NULL) Free(header);
-       if (data != NULL) Free(data);
+       if (name != NULL) OPENSSL_free(name);
+       if (header != NULL) OPENSSL_free(header);
+       if (data != NULL) OPENSSL_free(data);
        return(ret);
        }