cf1b7d9664
sure they are available in opensslconf.h, by giving them names starting with "OPENSSL_" to avoid conflicts with other packages and by making sure e_os2.h will cover all platform-specific cases together with opensslconf.h. I've checked fairly well that nothing breaks with this (apart from external software that will adapt if they have used something like NO_KRB5), but I can't guarantee it completely, so a review of this change would be a good thing.
139 lines
5.2 KiB
C
139 lines
5.2 KiB
C
/* crypto/asn1/d2i_pr.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/bn.h>
|
|
#include <openssl/evp.h>
|
|
#include <openssl/objects.h>
|
|
#include <openssl/asn1.h>
|
|
|
|
EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, unsigned char **pp,
|
|
long length)
|
|
{
|
|
EVP_PKEY *ret;
|
|
|
|
if ((a == NULL) || (*a == NULL))
|
|
{
|
|
if ((ret=EVP_PKEY_new()) == NULL)
|
|
{
|
|
ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_EVP_LIB);
|
|
return(NULL);
|
|
}
|
|
}
|
|
else ret= *a;
|
|
|
|
ret->save_type=type;
|
|
ret->type=EVP_PKEY_type(type);
|
|
switch (ret->type)
|
|
{
|
|
#ifndef OPENSSL_NO_RSA
|
|
case EVP_PKEY_RSA:
|
|
if ((ret->pkey.rsa=d2i_RSAPrivateKey(NULL,
|
|
(const unsigned char **)pp,length)) == NULL) /* TMP UGLY CAST */
|
|
{
|
|
ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_ASN1_LIB);
|
|
goto err;
|
|
}
|
|
break;
|
|
#endif
|
|
#ifndef OPENSSL_NO_DSA
|
|
case EVP_PKEY_DSA:
|
|
if ((ret->pkey.dsa=d2i_DSAPrivateKey(NULL,
|
|
(const unsigned char **)pp,length)) == NULL) /* TMP UGLY CAST */
|
|
{
|
|
ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_ASN1_LIB);
|
|
goto err;
|
|
}
|
|
break;
|
|
#endif
|
|
default:
|
|
ASN1err(ASN1_F_D2I_PRIVATEKEY,ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE);
|
|
goto err;
|
|
/* break; */
|
|
}
|
|
if (a != NULL) (*a)=ret;
|
|
return(ret);
|
|
err:
|
|
if ((ret != NULL) && ((a == NULL) || (*a != ret))) EVP_PKEY_free(ret);
|
|
return(NULL);
|
|
}
|
|
|
|
/* This works like d2i_PrivateKey() except it automatically works out the type */
|
|
|
|
EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, unsigned char **pp,
|
|
long length)
|
|
{
|
|
STACK_OF(ASN1_TYPE) *inkey;
|
|
unsigned char *p;
|
|
int keytype;
|
|
p = *pp;
|
|
/* Dirty trick: read in the ASN1 data into a STACK_OF(ASN1_TYPE):
|
|
* by analyzing it we can determine the passed structure: this
|
|
* assumes the input is surrounded by an ASN1 SEQUENCE.
|
|
*/
|
|
inkey = d2i_ASN1_SET_OF_ASN1_TYPE(NULL, &p, length, d2i_ASN1_TYPE,
|
|
ASN1_TYPE_free, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL);
|
|
/* Since we only need to discern "traditional format" RSA and DSA
|
|
* keys we can just count the elements.
|
|
*/
|
|
if(sk_ASN1_TYPE_num(inkey) == 6) keytype = EVP_PKEY_DSA;
|
|
else keytype = EVP_PKEY_RSA;
|
|
sk_ASN1_TYPE_pop_free(inkey, ASN1_TYPE_free);
|
|
return d2i_PrivateKey(keytype, a, pp, length);
|
|
}
|