Use util/mklink.pl instead of util/mklink.sh.

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

diff --git a/crypto/asn1/p7_signd.c b/crypto/asn1/p7_signd.c
index f4d03f8b8999cce7434d3ea1ec5fda8b334224e7..186e6ed0e1ea1ea2b36c856fa6fc917a457fd6ca 100644 (file)
--- a/crypto/asn1/p7_signd.c
+++ b/crypto/asn1/p7_signd.c
@@ -58,17 +58,10 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1_mac.h"
-#include "x509.h"
+#include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
-/*
- * ASN1err(ASN1_F_PKCS7_SIGNED_NEW,ERR_R_ASN1_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_D2I_PKCS7_SIGNED,ERR_R_ASN1_LENGTH_MISMATCH);
- */
-
-int i2d_PKCS7_SIGNED(a,pp)
-PKCS7_SIGNED *a;
-unsigned char **pp;
+int i2d_PKCS7_SIGNED(PKCS7_SIGNED *a, unsigned char **pp)
        {
        M_ASN1_I2D_vars(a);
 
@@ -91,10 +84,8 @@ unsigned char **pp;
        M_ASN1_I2D_finish();
        }
 
-PKCS7_SIGNED *d2i_PKCS7_SIGNED(a,pp,length)
-PKCS7_SIGNED **a;
-unsigned char **pp;
-long length;
+PKCS7_SIGNED *d2i_PKCS7_SIGNED(PKCS7_SIGNED **a, unsigned char **pp,
+            long length)
        {
        M_ASN1_D2I_vars(a,PKCS7_SIGNED *,PKCS7_SIGNED_new);
 
@@ -111,7 +102,7 @@ long length;
        M_ASN1_D2I_Finish(a,PKCS7_SIGNED_free,ASN1_F_D2I_PKCS7_SIGNED);
        }
 
-PKCS7_SIGNED *PKCS7_SIGNED_new()
+PKCS7_SIGNED *PKCS7_SIGNED_new(void)
        {
        PKCS7_SIGNED *ret=NULL;
        ASN1_CTX c;
@@ -127,8 +118,7 @@ PKCS7_SIGNED *PKCS7_SIGNED_new()
        M_ASN1_New_Error(ASN1_F_PKCS7_SIGNED_NEW);
        }
 
-void PKCS7_SIGNED_free(a)
-PKCS7_SIGNED *a;
+void PKCS7_SIGNED_free(PKCS7_SIGNED *a)
        {
        if (a == NULL) return;
        ASN1_INTEGER_free(a->version);