Linux on Alpha has the configuration name linux-alpha-gcc, not

[openssl.git] / crypto / pkcs12 / p12_mac.c

diff --git a/crypto/pkcs12/p12_mac.c b/crypto/pkcs12/p12_mac.c
index 907c371b7ab162c1feb884bdf4875834230dd493..fbd1eca24ff7bc18a20e344944d0519f122c65db 100644 (file)
--- a/crypto/pkcs12/p12_mac.c
+++ b/crypto/pkcs12/p12_mac.c
@@ -57,18 +57,11 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <asn1_mac.h>
-#include <err.h>
-#include "pkcs12.h"
-/*
- *ASN1err(ASN1_F_PKCS12_MAC_DATA_NEW,ASN1_R_DECODE_ERROR)
- *ASN1err(ASN1_F_D2I_PKCS12_MAC_DATA,ASN1_R_DECODE_ERROR)
- */
+#include "cryptlib.h"
+#include <openssl/asn1_mac.h>
+#include <openssl/pkcs12.h>
 
-int i2d_PKCS12_MAC_DATA(a,pp)
-PKCS12_MAC_DATA *a;
-unsigned char **pp;
+int i2d_PKCS12_MAC_DATA(PKCS12_MAC_DATA *a, unsigned char **pp)
 {
        M_ASN1_I2D_vars(a);
        M_ASN1_I2D_len (a->dinfo, i2d_X509_SIG);
@@ -83,38 +76,35 @@ unsigned char **pp;
        M_ASN1_I2D_finish();
 }
 
-PKCS12_MAC_DATA *PKCS12_MAC_DATA_new()
+PKCS12_MAC_DATA *PKCS12_MAC_DATA_new(void)
 {
        PKCS12_MAC_DATA *ret=NULL;
        ASN1_CTX c;
        M_ASN1_New_Malloc(ret, PKCS12_MAC_DATA);
        ret->dinfo = X509_SIG_new();
-       ret->salt = ASN1_OCTET_STRING_new();
+       ret->salt = M_ASN1_OCTET_STRING_new();
        ret->iter = NULL;
-       return (ret);
+       return(ret);
        M_ASN1_New_Error(ASN1_F_PKCS12_MAC_DATA_NEW);
 }
 
-PKCS12_MAC_DATA *d2i_PKCS12_MAC_DATA(a,pp,length)
-PKCS12_MAC_DATA **a;
-unsigned char **pp;
-long length;
+PKCS12_MAC_DATA *d2i_PKCS12_MAC_DATA(PKCS12_MAC_DATA **a, unsigned char **pp,
+            long length)
 {
        M_ASN1_D2I_vars(a,PKCS12_MAC_DATA *,PKCS12_MAC_DATA_new);
        M_ASN1_D2I_Init();
        M_ASN1_D2I_start_sequence();
-       M_ASN1_D2I_get (ret->dinfo, d2i_X509_SIG);
-       M_ASN1_D2I_get (ret->salt, d2i_ASN1_OCTET_STRING);
-       M_ASN1_D2I_get_opt (ret->iter, d2i_ASN1_INTEGER, V_ASN1_INTEGER);
+       M_ASN1_D2I_get(ret->dinfo, d2i_X509_SIG);
+       M_ASN1_D2I_get(ret->salt, d2i_ASN1_OCTET_STRING);
+       M_ASN1_D2I_get_opt(ret->iter, d2i_ASN1_INTEGER, V_ASN1_INTEGER);
        M_ASN1_D2I_Finish(a, PKCS12_MAC_DATA_free, ASN1_F_D2I_PKCS12_MAC_DATA);
 }
 
-void PKCS12_MAC_DATA_free (a)
-PKCS12_MAC_DATA *a;
+void PKCS12_MAC_DATA_free (PKCS12_MAC_DATA *a)
 {
        if (a == NULL) return;
        X509_SIG_free (a->dinfo);
-       ASN1_OCTET_STRING_free (a->salt);
-       ASN1_INTEGER_free (a->iter);
-       Free ((char *)a);
+       M_ASN1_OCTET_STRING_free(a->salt);
+       M_ASN1_INTEGER_free(a->iter);
+       OPENSSL_free (a);
 }