PR: 1644

[openssl.git] / crypto / asn1 / a_dup.c

diff --git a/crypto/asn1/a_dup.c b/crypto/asn1/a_dup.c
index 961b4cb069430ac1eeb225541dba5fbd4fc99e87..d98992548ab1b413efefa15021b7b845106dd090 100644 (file)
--- a/crypto/asn1/a_dup.c
+++ b/crypto/asn1/a_dup.c
@@ -58,29 +58,52 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1_mac.h"
+#include <openssl/asn1.h>
 
-#define READ_CHUNK   2048
+#ifndef NO_OLD_ASN1
 
-char *ASN1_dup(i2d,d2i,x)
-int (*i2d)();
-char *(*d2i)();
-char *x;
+void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x)
        {
        unsigned char *b,*p;
-       long i;
+       const unsigned char *p2;
+       int i;
        char *ret;
 
        if (x == NULL) return(NULL);
 
-       i=(long)i2d(x,NULL);
-       b=(unsigned char *)Malloc((unsigned int)i+10);
+       i=i2d(x,NULL);
+       b=OPENSSL_malloc(i+10);
        if (b == NULL)
                { ASN1err(ASN1_F_ASN1_DUP,ERR_R_MALLOC_FAILURE); return(NULL); }
        p= b;
        i=i2d(x,&p);
+       p2= b;
+       ret=d2i(NULL,&p2,i);
+       OPENSSL_free(b);
+       return(ret);
+       }
+
+#endif
+
+/* ASN1_ITEM version of dup: this follows the model above except we don't need
+ * to allocate the buffer. At some point this could be rewritten to directly dup
+ * the underlying structure instead of doing and encode and decode.
+ */
+
+void *ASN1_item_dup(const ASN1_ITEM *it, void *x)
+       {
+       unsigned char *b = NULL;
+       const unsigned char *p;
+       long i;
+       void *ret;
+
+       if (x == NULL) return(NULL);
+
+       i=ASN1_item_i2d(x,&b,it);
+       if (b == NULL)
+               { ASN1err(ASN1_F_ASN1_ITEM_DUP,ERR_R_MALLOC_FAILURE); return(NULL); }
        p= b;
-       ret=d2i(NULL,&p,i);
-       Free((char *)b);
+       ret=ASN1_item_d2i(NULL,&p,i, it);
+       OPENSSL_free(b);
        return(ret);
        }