Extend OID config module format.

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

diff --git a/crypto/asn1/a_dup.c b/crypto/asn1/a_dup.c
index 3202a816d0adae53b3ebd774a3892a352d48d346..dc6826ad1bb51a7b18a3a6650a8b02a5ddc8fb5b 100644 (file)
--- a/crypto/asn1/a_dup.c
+++ b/crypto/asn1/a_dup.c
@@ -58,9 +58,9 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include <openssl/asn1_mac.h>
+#include <openssl/asn1.h>
 
-#define READ_CHUNK   2048
+#ifndef NO_OLD_ASN1
 
 char *ASN1_dup(int (*i2d)(), char *(*d2i)(), char *x)
        {
@@ -71,13 +71,38 @@ char *ASN1_dup(int (*i2d)(), char *(*d2i)(), char *x)
        if (x == NULL) return(NULL);
 
        i=(long)i2d(x,NULL);
-       b=(unsigned char *)Malloc((unsigned int)i+10);
+       b=(unsigned char *)OPENSSL_malloc((unsigned int)i+10);
        if (b == NULL)
                { ASN1err(ASN1_F_ASN1_DUP,ERR_R_MALLOC_FAILURE); return(NULL); }
        p= b;
        i=i2d(x,&p);
        p= b;
        ret=d2i(NULL,&p,i);
-       Free(b);
+       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_DUP,ERR_R_MALLOC_FAILURE); return(NULL); }
+       p= b;
+       ret=ASN1_item_d2i(NULL,&p,i, it);
+       OPENSSL_free(b);
        return(ret);
        }