? crypto/aes/aes-armv4.S

[openssl.git] / crypto / x509 / x509spki.c

diff --git a/crypto/x509/x509spki.c b/crypto/x509/x509spki.c
index 984e35aaae7d24b98c569e332f84e404be5db0ee..02a203d72c61de52417ee657f5377fd815edb545 100644 (file)
--- a/crypto/x509/x509spki.c
+++ b/crypto/x509/x509spki.c
@@ -1,5 +1,5 @@
 /* x509spki.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
 /* ====================================================================
@@ -59,7 +59,6 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/x509.h>
-#include <openssl/asn1_mac.h>
 
 int NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *x, EVP_PKEY *pkey)
 {
@@ -76,26 +75,27 @@ EVP_PKEY *NETSCAPE_SPKI_get_pubkey(NETSCAPE_SPKI *x)
 
 /* Load a Netscape SPKI from a base64 encoded string */
 
-NETSCAPE_SPKI * NETSCAPE_SPKI_b64_decode(char *str, int len)
+NETSCAPE_SPKI * NETSCAPE_SPKI_b64_decode(const char *str, int len)
 {
-       unsigned char *spki_der, *p;
+       unsigned char *spki_der;
+       const unsigned char *p;
        int spki_len;
        NETSCAPE_SPKI *spki;
        if(len <= 0) len = strlen(str);
-       if (!(spki_der = Malloc(len + 1))) {
+       if (!(spki_der = OPENSSL_malloc(len + 1))) {
                X509err(X509_F_NETSCAPE_SPKI_B64_DECODE, ERR_R_MALLOC_FAILURE);
                return NULL;
        }
-       spki_len = EVP_DecodeBlock(spki_der, str, len);
+       spki_len = EVP_DecodeBlock(spki_der, (const unsigned char *)str, len);
        if(spki_len < 0) {
                X509err(X509_F_NETSCAPE_SPKI_B64_DECODE,
                                                X509_R_BASE64_DECODE_ERROR);
-               Free(spki_der);
+               OPENSSL_free(spki_der);
                return NULL;
        }
        p = spki_der;
        spki = d2i_NETSCAPE_SPKI(NULL, &p, spki_len);
-       Free(spki_der);
+       OPENSSL_free(spki_der);
        return spki;
 }
 
@@ -107,15 +107,15 @@ char * NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *spki)
        char *b64_str;
        int der_len;
        der_len = i2d_NETSCAPE_SPKI(spki, NULL);
-       der_spki = Malloc(der_len);
-       b64_str = Malloc(der_len * 2);
+       der_spki = OPENSSL_malloc(der_len);
+       b64_str = OPENSSL_malloc(der_len * 2);
        if(!der_spki || !b64_str) {
                X509err(X509_F_NETSCAPE_SPKI_B64_ENCODE, ERR_R_MALLOC_FAILURE);
                return NULL;
        }
        p = der_spki;
        i2d_NETSCAPE_SPKI(spki, &p);
-       EVP_EncodeBlock(b64_str, der_spki, der_len);
-       Free(der_spki);
+       EVP_EncodeBlock((unsigned char *)b64_str, der_spki, der_len);
+       OPENSSL_free(der_spki);
        return b64_str;
 }