1 files changed, 24 insertions, 36 deletions

diff --git a/src/lib/libcrypto/pem/pem_info.c b/src/lib/libcrypto/pem/pem_info.c
index 4b69833b62..fec18a4c2e 100644
--- a/src/lib/libcrypto/pem/pem_info.c
+++ b/src/lib/libcrypto/pem/pem_info.c
@@ -58,20 +58,17 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "buffer.h"
-#include "objects.h"
-#include "evp.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/buffer.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #ifndef NO_FP_API
-STACK *PEM_X509_INFO_read(fp,sk,cb)
-FILE *fp;
-STACK *sk;
-int (*cb)();
+STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u)
         {
         BIO *b;
-        STACK *ret;
+        STACK_OF(X509_INFO) *ret;
 
         if ((b=BIO_new(BIO_s_file())) == NULL)
                 {
@@ -79,29 +76,26 @@ int (*cb)();
                 return(0);
                 }
         BIO_set_fp(b,fp,BIO_NOCLOSE);
-        ret=PEM_X509_INFO_read_bio(b,sk,cb);
+        ret=PEM_X509_INFO_read_bio(b,sk,cb,u);
         BIO_free(b);
         return(ret);
         }
 #endif
 
-STACK *PEM_X509_INFO_read_bio(bp,sk,cb)
-BIO *bp;
-STACK *sk;
-int (*cb)();
+STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u)
         {
         X509_INFO *xi=NULL;
         char *name=NULL,*header=NULL,**pp;
         unsigned char *data=NULL,*p;
         long len,error=0;
         int ok=0;
-        STACK *ret=NULL;
+        STACK_OF(X509_INFO) *ret=NULL;
         unsigned int i,raw;
         char *(*d2i)();
 
         if (sk == NULL)
                 {
-                if ((ret=sk_new_null()) == NULL)
+                if ((ret=sk_X509_INFO_new_null()) == NULL)
                         {
                         PEMerr(PEM_F_PEM_X509_INFO_READ_BIO,ERR_R_MALLOC_FAILURE);
                         goto err;
@@ -132,7 +126,7 @@ start:
                         d2i=(char *(*)())d2i_X509;
                         if (xi->x509 != NULL)
                                 {
-                                if (!sk_push(ret,(char *)xi)) goto err;
+                                if (!sk_X509_INFO_push(ret,xi)) goto err;
                                 if ((xi=X509_INFO_new()) == NULL) goto err;
                                 goto start;
                                 }
@@ -143,7 +137,7 @@ start:
                         d2i=(char *(*)())d2i_X509_CRL;
                         if (xi->crl != NULL)
                                 {
-                                if (!sk_push(ret,(char *)xi)) goto err;
+                                if (!sk_X509_INFO_push(ret,xi)) goto err;
                                 if ((xi=X509_INFO_new()) == NULL) goto err;
                                 goto start;
                                 }
@@ -156,7 +150,7 @@ start:
                         d2i=(char *(*)())d2i_RSAPrivateKey;
                         if (xi->x_pkey != NULL) 
                                 {
-                                if (!sk_push(ret,(char *)xi)) goto err;
+                                if (!sk_X509_INFO_push(ret,xi)) goto err;
                                 if ((xi=X509_INFO_new()) == NULL) goto err;
                                 goto start;
                                 }
@@ -180,7 +174,7 @@ start:
                         d2i=(char *(*)())d2i_DSAPrivateKey;
                         if (xi->x_pkey != NULL) 
                                 {
-                                if (!sk_push(ret,(char *)xi)) goto err;
+                                if (!sk_X509_INFO_push(ret,xi)) goto err;
                                 if ((xi=X509_INFO_new()) == NULL) goto err;
                                 goto start;
                                 }
@@ -211,7 +205,7 @@ start:
 
                                 if (!PEM_get_EVP_CIPHER_INFO(header,&cipher))
                                         goto err;
-                                if (!PEM_do_header(&cipher,data,&len,cb))
+                                if (!PEM_do_header(&cipher,data,&len,cb,u))
                                         goto err;
                                 p=data;
                                 if (d2i(pp,&p,len) == NULL)
@@ -246,7 +240,7 @@ start:
         if ((xi->x509 != NULL) || (xi->crl != NULL) ||
                 (xi->x_pkey != NULL) || (xi->enc_data != NULL))
                 {
-                if (!sk_push(ret,(char *)xi)) goto err;
+                if (!sk_X509_INFO_push(ret,xi)) goto err;
                 xi=NULL;
                 }
         ok=1;
@@ -254,12 +248,12 @@ err:
         if (xi != NULL) X509_INFO_free(xi);
         if (!ok)
                 {
-                for (i=0; ((int)i)<sk_num(ret); i++)
+                for (i=0; ((int)i)<sk_X509_INFO_num(ret); i++)
                         {
-                        xi=(X509_INFO *)sk_value(ret,i);
+                        xi=sk_X509_INFO_value(ret,i);
                         X509_INFO_free(xi);
                         }
-                if (ret != sk) sk_free(ret);
+                if (ret != sk) sk_X509_INFO_free(ret);
                 ret=NULL;
                 }
                 
@@ -271,19 +265,13 @@ err:
 
 
 /* A TJH addition */
-int PEM_X509_INFO_write_bio(bp,xi,enc,kstr,klen,cb)
-BIO *bp;
-X509_INFO *xi;
-EVP_CIPHER *enc;
-unsigned char *kstr;
-int klen;
-int (*cb)();
+int PEM_X509_INFO_write_bio(BIO *bp, X509_INFO *xi, EVP_CIPHER *enc,
+             unsigned char *kstr, int klen, pem_password_cb *cb, void *u)
         {
         EVP_CIPHER_CTX ctx;
         int i,ret=0;
         unsigned char *data=NULL;
-        char *objstr=NULL;
-#define PEM_BUFSIZE     1024
+        const char *objstr=NULL;
         char buf[PEM_BUFSIZE];
         unsigned char *iv=NULL;
         
@@ -340,7 +328,7 @@ int (*cb)();
                         /* normal optionally encrypted stuff */
                         if (PEM_write_bio_RSAPrivateKey(bp,
                                 xi->x_pkey->dec_pkey->pkey.rsa,
-                                enc,kstr,klen,cb)<=0)
+                                enc,kstr,klen,cb,u)<=0)
                                 goto err;
 #endif
                         }