Various enhancements to PKCS#12 code, new

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

diff --git a/crypto/asn1/asn_pack.c b/crypto/asn1/asn_pack.c
index 0b9ed691a9647fea7fe5778f3effd66b29f5c912..e6051db2dc98d6fe81934fd1ed473abfb8a9d2a5 100644 (file)
--- a/crypto/asn1/asn_pack.c
+++ b/crypto/asn1/asn_pack.c
@@ -60,6 +60,8 @@
 #include "cryptlib.h"
 #include <openssl/asn1.h>
 
+#ifndef NO_ASN1_OLD
+
 /* ASN1 packing and unpacking functions */
 
 /* Turn an ASN1 encoded SEQUENCE OF into a STACK of structures */
@@ -143,9 +145,11 @@ ASN1_STRING *ASN1_pack_string(void *obj, int (*i2d)(), ASN1_STRING **oct)
        return octmp;
 }
 
+#endif
+
 /* ASN1_ITEM versions of the above */
 
-ASN1_STRING *ASN1_pack_item(void *obj, const ASN1_ITEM *it, ASN1_STRING **oct)
+ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_STRING **oct)
 {
        ASN1_STRING *octmp;
 
@@ -175,7 +179,7 @@ ASN1_STRING *ASN1_pack_item(void *obj, const ASN1_ITEM *it, ASN1_STRING **oct)
 
 /* Extract an ASN1 object from an ASN1_STRING */
 
-void *ASN1_unpack_item(ASN1_STRING *oct, const ASN1_ITEM *it)
+void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it)
 {
        unsigned char *p;
        void *ret;