mirror of
https://github.com/guanzhi/GmSSL.git
synced 2026-08-11 16:33:40 +08:00
update
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
/* x509spki.c */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 1999.
|
||||
/*
|
||||
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
|
||||
* 1999.
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 1999 The OpenSSL Project. All rights reserved.
|
||||
@@ -10,7 +11,7 @@
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
@@ -62,60 +63,61 @@
|
||||
|
||||
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));
|
||||
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));
|
||||
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)
|
||||
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))) {
|
||||
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;
|
||||
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))) {
|
||||
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)
|
||||
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 || !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((unsigned char *)b64_str, der_spki, der_len);
|
||||
OPENSSL_free(der_spki);
|
||||
return b64_str;
|
||||
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 || !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((unsigned char *)b64_str, der_spki, der_len);
|
||||
OPENSSL_free(der_spki);
|
||||
return b64_str;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user