From 73e92de57759ea1fadbc7a9d08e02b99a752d688 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Thu, 28 Dec 2000 22:24:50 +0000
Subject: Add NO_ASN1_OLD to remove some old style functions: currently OpenSSL
 itself wont compile with this set because some old style stuff remains.

Change old functions X509_sign(), X509_verify() etc
to use new item based functions.

Replace OCSP function declarations with DECLARE macros.
---
 crypto/asn1/a_digest.c | 4 ++++
 crypto/asn1/a_set.c    | 3 +++
 crypto/asn1/a_sign.c   | 4 ++++
 crypto/asn1/a_verify.c | 4 ++++
 4 files changed, 15 insertions(+)

(limited to 'crypto/asn1')

diff --git a/crypto/asn1/a_digest.c b/crypto/asn1/a_digest.c
index fb4686fdbd..6c12249d2c 100644
--- a/crypto/asn1/a_digest.c
+++ b/crypto/asn1/a_digest.c
@@ -69,6 +69,8 @@
 #include <openssl/buffer.h>
 #include <openssl/x509.h>
 
+#ifndef NO_ASN1_OLD
+
 int ASN1_digest(int (*i2d)(), const EVP_MD *type, char *data,
 		unsigned char *md, unsigned int *len)
 	{
@@ -88,6 +90,8 @@ int ASN1_digest(int (*i2d)(), const EVP_MD *type, char *data,
 	return(1);
 	}
 
+#endif
+
 
 int ASN1_item_digest(const ASN1_ITEM *it, const EVP_MD *type, void *asn,
 		unsigned char *md, unsigned int *len)
diff --git a/crypto/asn1/a_set.c b/crypto/asn1/a_set.c
index caf5a1419c..19bb60fca8 100644
--- a/crypto/asn1/a_set.c
+++ b/crypto/asn1/a_set.c
@@ -60,6 +60,8 @@
 #include "cryptlib.h"
 #include <openssl/asn1_mac.h>
 
+#ifndef NO_ASN1_OLD
+
 typedef struct
     {
     unsigned char *pbData;
@@ -215,3 +217,4 @@ err:
 	return(NULL);
 	}
 
+#endif
diff --git a/crypto/asn1/a_sign.c b/crypto/asn1/a_sign.c
index 5be077ddfc..67f130840d 100644
--- a/crypto/asn1/a_sign.c
+++ b/crypto/asn1/a_sign.c
@@ -71,6 +71,8 @@
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
 
+#ifndef NO_ASN1_OLD
+
 int ASN1_sign(int (*i2d)(), X509_ALGOR *algor1, X509_ALGOR *algor2,
 	     ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey,
 	     const EVP_MD *type)
@@ -147,6 +149,8 @@ err:
 	return(outl);
 	}
 
+#endif
+
 int ASN1_item_sign(const ASN1_ITEM *it, X509_ALGOR *algor1, X509_ALGOR *algor2,
 	     ASN1_BIT_STRING *signature, void *asn, EVP_PKEY *pkey,
 	     const EVP_MD *type)
diff --git a/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c
index be5a27e58b..4b4a240f50 100644
--- a/crypto/asn1/a_verify.c
+++ b/crypto/asn1/a_verify.c
@@ -71,6 +71,8 @@
 #include <openssl/buffer.h>
 #include <openssl/evp.h>
 
+#ifndef NO_ASN1_OLD
+
 int ASN1_verify(int (*i2d)(), X509_ALGOR *a, ASN1_BIT_STRING *signature,
 	     char *data, EVP_PKEY *pkey)
 	{
@@ -118,6 +120,8 @@ err:
 	return(ret);
 	}
 
+#endif
+
 
 int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a, ASN1_BIT_STRING *signature,
 	     void *asn, EVP_PKEY *pkey)
-- 
cgit v1.2.3