1241126adf
Split private key PEM and normal PEM handling. Private key handling needs to link in stuff like PKCS#8. Relocate the ASN1 *_dup() functions, to the relevant ASN1 modules using new macro IMPLEMENT_ASN1_DUP_FUNCTION. Previously these were all in crypto/x509/x_all.c along with every ASN1 BIO/fp function which linked in *every* ASN1 function if a single dup was used. Move the authority key id ASN1 structure to a separate file. This is used in the X509 routines and its previous location linked in all the v3 extension code. Also move ASN1_tag2bit to avoid linking in a_bytes.c which is now largely obsolete. So far under Linux stripped binary with single PEM_read_X509 is now 238K compared to 380K before these changes.
139 lines
5.1 KiB
C
139 lines
5.1 KiB
C
/* crypto/pem/pem_pkey.c */
|
|
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
|
* All rights reserved.
|
|
*
|
|
* This package is an SSL implementation written
|
|
* by Eric Young (eay@cryptsoft.com).
|
|
* The implementation was written so as to conform with Netscapes SSL.
|
|
*
|
|
* This library is free for commercial and non-commercial use as long as
|
|
* the following conditions are aheared to. The following conditions
|
|
* apply to all code found in this distribution, be it the RC4, RSA,
|
|
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
|
* included with this distribution is covered by the same copyright terms
|
|
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
|
*
|
|
* Copyright remains Eric Young's, and as such any Copyright notices in
|
|
* the code are not to be removed.
|
|
* If this package is used in a product, Eric Young should be given attribution
|
|
* as the author of the parts of the library used.
|
|
* This can be in the form of a textual message at program startup or
|
|
* in documentation (online or textual) provided with the package.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the copyright
|
|
* 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 the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* "This product includes cryptographic software written by
|
|
* Eric Young (eay@cryptsoft.com)"
|
|
* The word 'cryptographic' can be left out if the rouines from the library
|
|
* being used are not cryptographic related :-).
|
|
* 4. If you include any Windows specific code (or a derivative thereof) from
|
|
* the apps directory (application code) you must include an acknowledgement:
|
|
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* The licence and distribution terms for any publically available version or
|
|
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
|
* copied and put under another distribution licence
|
|
* [including the GNU Public Licence.]
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include "cryptlib.h"
|
|
#include <openssl/buffer.h>
|
|
#include <openssl/objects.h>
|
|
#include <openssl/evp.h>
|
|
#include <openssl/rand.h>
|
|
#include <openssl/x509.h>
|
|
#include <openssl/pkcs12.h>
|
|
#include <openssl/pem.h>
|
|
|
|
|
|
EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u)
|
|
{
|
|
char *nm=NULL;
|
|
unsigned char *p=NULL,*data=NULL;
|
|
long len;
|
|
EVP_PKEY *ret=NULL;
|
|
|
|
if (!PEM_bytes_read_bio(&data, &len, &nm, PEM_STRING_EVP_PKEY, bp, cb, u))
|
|
return NULL;
|
|
p = data;
|
|
|
|
if (strcmp(nm,PEM_STRING_RSA) == 0)
|
|
ret=d2i_PrivateKey(EVP_PKEY_RSA,x,&p,len);
|
|
else if (strcmp(nm,PEM_STRING_DSA) == 0)
|
|
ret=d2i_PrivateKey(EVP_PKEY_DSA,x,&p,len);
|
|
else if (strcmp(nm,PEM_STRING_PKCS8INF) == 0) {
|
|
PKCS8_PRIV_KEY_INFO *p8inf;
|
|
p8inf=d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, len);
|
|
ret = EVP_PKCS82PKEY(p8inf);
|
|
PKCS8_PRIV_KEY_INFO_free(p8inf);
|
|
} else if (strcmp(nm,PEM_STRING_PKCS8) == 0) {
|
|
PKCS8_PRIV_KEY_INFO *p8inf;
|
|
X509_SIG *p8;
|
|
int klen;
|
|
char psbuf[PEM_BUFSIZE];
|
|
p8 = d2i_X509_SIG(NULL, &p, len);
|
|
if(!p8) goto p8err;
|
|
if (cb) klen=cb(psbuf,PEM_BUFSIZE,0,u);
|
|
else klen=PEM_def_callback(psbuf,PEM_BUFSIZE,0,u);
|
|
if (klen <= 0) {
|
|
PEMerr(PEM_F_PEM_ASN1_READ_BIO,
|
|
PEM_R_BAD_PASSWORD_READ);
|
|
goto err;
|
|
}
|
|
p8inf = PKCS8_decrypt(p8, psbuf, klen);
|
|
X509_SIG_free(p8);
|
|
if(!p8inf) goto p8err;
|
|
ret = EVP_PKCS82PKEY(p8inf);
|
|
if(x) {
|
|
if(*x) EVP_PKEY_free((EVP_PKEY *)*x);
|
|
*x = ret;
|
|
}
|
|
PKCS8_PRIV_KEY_INFO_free(p8inf);
|
|
}
|
|
p8err:
|
|
if (ret == NULL)
|
|
PEMerr(PEM_F_PEM_ASN1_READ_BIO,ERR_R_ASN1_LIB);
|
|
err:
|
|
OPENSSL_free(nm);
|
|
OPENSSL_free(data);
|
|
return(ret);
|
|
}
|
|
|
|
#ifndef OPENSSL_NO_FP_API
|
|
EVP_PKEY *PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
|
|
{
|
|
BIO *b;
|
|
EVP_PKEY *ret;
|
|
|
|
if ((b=BIO_new(BIO_s_file())) == NULL)
|
|
{
|
|
PEMerr(PEM_F_PEM_ASN1_READ,ERR_R_BUF_LIB);
|
|
return(0);
|
|
}
|
|
BIO_set_fp(b,fp,BIO_NOCLOSE);
|
|
ret=PEM_read_bio_PrivateKey(b,x,cb,u);
|
|
BIO_free(b);
|
|
return(ret);
|
|
}
|
|
#endif
|