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

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

diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c
index 2177ebd6ed41e1954f780e4a537abb7c673416cb..7e3bd0581c0aa4291b4979b176809180e64d82d3 100644 (file)
--- a/crypto/asn1/x_pubkey.c
+++ b/crypto/asn1/x_pubkey.c
@@ -58,16 +58,9 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1_mac.h"
+#include <openssl/asn1_mac.h>
 
-/*
- * ASN1err(ASN1_F_D2I_X509_PUBKEY,ERR_R_ASN1_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_X509_PUBKEY_NEW,ERR_R_ASN1_LENGTH_MISMATCH);
- */
-
-int i2d_X509_PUBKEY(a,pp)
-X509_PUBKEY *a;
-unsigned char **pp;
+int i2d_X509_PUBKEY(X509_PUBKEY *a, unsigned char **pp)
        {
        M_ASN1_I2D_vars(a);
 
@@ -82,10 +75,8 @@ unsigned char **pp;
        M_ASN1_I2D_finish();
        }
 
-X509_PUBKEY *d2i_X509_PUBKEY(a,pp,length)
-X509_PUBKEY **a;
-unsigned char **pp;
-long length;
+X509_PUBKEY *d2i_X509_PUBKEY(X509_PUBKEY **a, unsigned char **pp,
+            long length)
        {
        M_ASN1_D2I_vars(a,X509_PUBKEY *,X509_PUBKEY_new);
 
@@ -101,7 +92,7 @@ long length;
        M_ASN1_D2I_Finish(a,X509_PUBKEY_free,ASN1_F_D2I_X509_PUBKEY);
        }
 
-X509_PUBKEY *X509_PUBKEY_new()
+X509_PUBKEY *X509_PUBKEY_new(void)
        {
        X509_PUBKEY *ret=NULL;
        ASN1_CTX c;
@@ -114,8 +105,7 @@ X509_PUBKEY *X509_PUBKEY_new()
        M_ASN1_New_Error(ASN1_F_X509_PUBKEY_NEW);
        }
 
-void X509_PUBKEY_free(a)
-X509_PUBKEY *a;
+void X509_PUBKEY_free(X509_PUBKEY *a)
        {
        if (a == NULL) return;
        X509_ALGOR_free(a->algor);
@@ -124,9 +114,7 @@ X509_PUBKEY *a;
        Free((char *)a);
        }
 
-int X509_PUBKEY_set(x,pkey)
-X509_PUBKEY **x;
-EVP_PKEY *pkey;
+int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
        {
        int ok=0;
        X509_PUBKEY *pk;
@@ -209,8 +197,7 @@ err:
        return(ok);
        }
 
-EVP_PKEY *X509_PUBKEY_get(key)
-X509_PUBKEY *key;
+EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
        {
        EVP_PKEY *ret=NULL;
        long j;