enginetest needs 'memset' defined.

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

diff --git a/crypto/asn1/i2d_pr.c b/crypto/asn1/i2d_pr.c
index b6b821d73c71c222d13d66925552d604381cc465..297e8376f8a4deef6f6a029924140f255bff9f13 100644 (file)
--- a/crypto/asn1/i2d_pr.c
+++ b/crypto/asn1/i2d_pr.c
@@ -58,22 +58,22 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bn.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/bn.h>
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
 
-int i2d_PrivateKey(a,pp)
-EVP_PKEY *a;
-unsigned char **pp;
+int i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp)
        {
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
        if (a->type == EVP_PKEY_RSA)
                {
                return(i2d_RSAPrivateKey(a->pkey.rsa,pp));
                }
        else
 #endif
-#ifndef NO_DSA
+#ifndef OPENSSL_NO_DSA
        if (a->type == EVP_PKEY_DSA)
                {
                return(i2d_DSAPrivateKey(a->pkey.dsa,pp));