New macro BIO_set_shutdown_wr().

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

diff --git a/crypto/asn1/x_spki.c b/crypto/asn1/x_spki.c
index 4a80df44b84c0b4a10251bbeb56aa339b948d0d9..4f01888f7d53c892fd974356d4f7b13dc7185305 100644 (file)
--- a/crypto/asn1/x_spki.c
+++ b/crypto/asn1/x_spki.c
@@ -57,24 +57,15 @@
  */
 
  /* This module was send to me my Pat Richards <patr@x509.com> who
-  * wrote it.  It is under my Copyright with his permision
+  * wrote it.  It is under my Copyright with his permission
   */
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "x509.h"
-#include "asn1_mac.h"
-
-/*
- * ASN1err(ASN1_F_D2I_NETSCAPE_SPKAC,ASN1_R_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_NETSCAPE_SPKAC_NEW,ASN1_R_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_D2I_NETSCAPE_SPKI,ASN1_R_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_NETSCAPE_SPKI_NEW,ASN1_R_LENGTH_MISMATCH);
- */
+#include <openssl/x509.h>
+#include <openssl/asn1_mac.h>
 
-int i2d_NETSCAPE_SPKAC(a,pp)
-NETSCAPE_SPKAC *a;
-unsigned char **pp;
+int i2d_NETSCAPE_SPKAC(NETSCAPE_SPKAC *a, unsigned char **pp)
        {
        M_ASN1_I2D_vars(a);
 
@@ -89,10 +80,8 @@ unsigned char **pp;
        M_ASN1_I2D_finish();
        }
 
-NETSCAPE_SPKAC *d2i_NETSCAPE_SPKAC(a,pp,length)
-NETSCAPE_SPKAC **a;
-unsigned char **pp;
-long length;
+NETSCAPE_SPKAC *d2i_NETSCAPE_SPKAC(NETSCAPE_SPKAC **a, unsigned char **pp,
+            long length)
        {
        M_ASN1_D2I_vars(a,NETSCAPE_SPKAC *,NETSCAPE_SPKAC_new);
 
@@ -103,29 +92,27 @@ long length;
        M_ASN1_D2I_Finish(a,NETSCAPE_SPKAC_free,ASN1_F_D2I_NETSCAPE_SPKAC);
        }
 
-NETSCAPE_SPKAC *NETSCAPE_SPKAC_new()
+NETSCAPE_SPKAC *NETSCAPE_SPKAC_new(void)
        {
        NETSCAPE_SPKAC *ret=NULL;
+       ASN1_CTX c;
 
        M_ASN1_New_Malloc(ret,NETSCAPE_SPKAC);
        M_ASN1_New(ret->pubkey,X509_PUBKEY_new);
-       M_ASN1_New(ret->challenge,ASN1_IA5STRING_new);
+       M_ASN1_New(ret->challenge,M_ASN1_IA5STRING_new);
        return(ret);
        M_ASN1_New_Error(ASN1_F_NETSCAPE_SPKAC_NEW);
        }
 
-void NETSCAPE_SPKAC_free(a)
-NETSCAPE_SPKAC *a;
+void NETSCAPE_SPKAC_free(NETSCAPE_SPKAC *a)
        {
        if (a == NULL) return;
        X509_PUBKEY_free(a->pubkey);
-       ASN1_IA5STRING_free(a->challenge);
-       Free((char *)a);
+       M_ASN1_IA5STRING_free(a->challenge);
+       OPENSSL_free(a);
        }
 
-int i2d_NETSCAPE_SPKI(a,pp)
-NETSCAPE_SPKI *a;
-unsigned char **pp;
+int i2d_NETSCAPE_SPKI(NETSCAPE_SPKI *a, unsigned char **pp)
        {
        M_ASN1_I2D_vars(a);
 
@@ -142,10 +129,8 @@ unsigned char **pp;
        M_ASN1_I2D_finish();
        }
 
-NETSCAPE_SPKI *d2i_NETSCAPE_SPKI(a,pp,length)
-NETSCAPE_SPKI **a;
-unsigned char **pp;
-long length;
+NETSCAPE_SPKI *d2i_NETSCAPE_SPKI(NETSCAPE_SPKI **a, unsigned char **pp,
+            long length)
        {
        M_ASN1_D2I_vars(a,NETSCAPE_SPKI *,NETSCAPE_SPKI_new);
 
@@ -157,25 +142,25 @@ long length;
        M_ASN1_D2I_Finish(a,NETSCAPE_SPKI_free,ASN1_F_D2I_NETSCAPE_SPKI);
        }
 
-NETSCAPE_SPKI *NETSCAPE_SPKI_new()
+NETSCAPE_SPKI *NETSCAPE_SPKI_new(void)
        {
        NETSCAPE_SPKI *ret=NULL;
+       ASN1_CTX c;
 
        M_ASN1_New_Malloc(ret,NETSCAPE_SPKI);
        M_ASN1_New(ret->spkac,NETSCAPE_SPKAC_new);
        M_ASN1_New(ret->sig_algor,X509_ALGOR_new);
-       M_ASN1_New(ret->signature,ASN1_BIT_STRING_new);
+       M_ASN1_New(ret->signature,M_ASN1_BIT_STRING_new);
        return(ret);
        M_ASN1_New_Error(ASN1_F_NETSCAPE_SPKI_NEW);
        }
 
-void NETSCAPE_SPKI_free(a)
-NETSCAPE_SPKI *a;
+void NETSCAPE_SPKI_free(NETSCAPE_SPKI *a)
        {
        if (a == NULL) return;
        NETSCAPE_SPKAC_free(a->spkac);
        X509_ALGOR_free(a->sig_algor);
-       ASN1_BIT_STRING_free(a->signature);
-       Free((char *)a);
+       M_ASN1_BIT_STRING_free(a->signature);
+       OPENSSL_free(a);
        }