26a7d938c9
Since return is inconsistent, I removed unnecessary parentheses and unified them. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4541)
75 lines
2.2 KiB
C
75 lines
2.2 KiB
C
/*
|
|
* Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/x509.h>
|
|
|
|
int NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *x, EVP_PKEY *pkey)
|
|
{
|
|
if ((x == NULL) || (x->spkac == NULL))
|
|
return 0;
|
|
return X509_PUBKEY_set(&(x->spkac->pubkey), pkey);
|
|
}
|
|
|
|
EVP_PKEY *NETSCAPE_SPKI_get_pubkey(NETSCAPE_SPKI *x)
|
|
{
|
|
if ((x == NULL) || (x->spkac == NULL))
|
|
return NULL;
|
|
return X509_PUBKEY_get(x->spkac->pubkey);
|
|
}
|
|
|
|
/* Load a Netscape SPKI from a base64 encoded string */
|
|
|
|
NETSCAPE_SPKI *NETSCAPE_SPKI_b64_decode(const char *str, int len)
|
|
{
|
|
unsigned char *spki_der;
|
|
const unsigned char *p;
|
|
int spki_len;
|
|
NETSCAPE_SPKI *spki;
|
|
if (len <= 0)
|
|
len = strlen(str);
|
|
if ((spki_der = OPENSSL_malloc(len + 1)) == NULL) {
|
|
X509err(X509_F_NETSCAPE_SPKI_B64_DECODE, ERR_R_MALLOC_FAILURE);
|
|
return NULL;
|
|
}
|
|
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);
|
|
OPENSSL_free(spki_der);
|
|
return NULL;
|
|
}
|
|
p = spki_der;
|
|
spki = d2i_NETSCAPE_SPKI(NULL, &p, spki_len);
|
|
OPENSSL_free(spki_der);
|
|
return spki;
|
|
}
|
|
|
|
/* Generate a base64 encoded string from an SPKI */
|
|
|
|
char *NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *spki)
|
|
{
|
|
unsigned char *der_spki, *p;
|
|
char *b64_str;
|
|
int der_len;
|
|
der_len = i2d_NETSCAPE_SPKI(spki, NULL);
|
|
der_spki = OPENSSL_malloc(der_len);
|
|
b64_str = OPENSSL_malloc(der_len * 2);
|
|
if (der_spki == NULL || b64_str == NULL) {
|
|
X509err(X509_F_NETSCAPE_SPKI_B64_ENCODE, ERR_R_MALLOC_FAILURE);
|
|
OPENSSL_free(der_spki);
|
|
OPENSSL_free(b64_str);
|
|
return NULL;
|
|
}
|
|
p = der_spki;
|
|
i2d_NETSCAPE_SPKI(spki, &p);
|
|
EVP_EncodeBlock((unsigned char *)b64_str, der_spki, der_len);
|
|
OPENSSL_free(der_spki);
|
|
return b64_str;
|
|
}
|