Commit 6aa2e59e authored by Shane Lontis's avatar Shane Lontis
Browse files

Add d2i_KeyParams/i2d_KeyParams API's. 



Convert EVP_PKEY Parameters to/from binary.
This wraps the low level i2d/d2i calls for DH,DSA and EC key parameters
in a similar way to Public and Private Keys.
The API's can be used by applications (including openssl apps) that only
want to use EVP_PKEY without needing to access low level key API's.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8903)
parent 32495464

crypto/asn1/asn1_err.c

+3 −1
Original line number Diff line number Diff line 
/*

 * Generated by util/mkerr.pl DO NOT EDIT

 * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the Apache License 2.0 (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -107,6 +107,7 @@ static const ERR_STRING_DATA ASN1_str_functs[] = { 
    {ERR_PACK(ERR_LIB_ASN1, ASN1_F_D2I_ASN1_UINTEGER, 0), "d2i_ASN1_UINTEGER"},

    {ERR_PACK(ERR_LIB_ASN1, ASN1_F_D2I_AUTOPRIVATEKEY, 0),

     "d2i_AutoPrivateKey"},

    {ERR_PACK(ERR_LIB_ASN1, ASN1_F_D2I_KEYPARAMS, 0), "d2i_KeyParams"},

    {ERR_PACK(ERR_LIB_ASN1, ASN1_F_D2I_PRIVATEKEY, 0), "d2i_PrivateKey"},

    {ERR_PACK(ERR_LIB_ASN1, ASN1_F_D2I_PUBLICKEY, 0), "d2i_PublicKey"},

    {ERR_PACK(ERR_LIB_ASN1, ASN1_F_DO_BUF, 0), "do_buf"},
@@ -119,6 +120,7 @@ static const ERR_STRING_DATA ASN1_str_functs[] = { 
    {ERR_PACK(ERR_LIB_ASN1, ASN1_F_I2D_ASN1_OBJECT, 0), "i2d_ASN1_OBJECT"},

    {ERR_PACK(ERR_LIB_ASN1, ASN1_F_I2D_DSA_PUBKEY, 0), "i2d_DSA_PUBKEY"},

    {ERR_PACK(ERR_LIB_ASN1, ASN1_F_I2D_EC_PUBKEY, 0), "i2d_EC_PUBKEY"},

    {ERR_PACK(ERR_LIB_ASN1, ASN1_F_I2D_KEYPARAMS, 0), "i2d_KeyParams"},

    {ERR_PACK(ERR_LIB_ASN1, ASN1_F_I2D_PRIVATEKEY, 0), "i2d_PrivateKey"},

    {ERR_PACK(ERR_LIB_ASN1, ASN1_F_I2D_PUBLICKEY, 0), "i2d_PublicKey"},

    {ERR_PACK(ERR_LIB_ASN1, ASN1_F_I2D_RSA_PUBKEY, 0), "i2d_RSA_PUBKEY"},

crypto/asn1/build.info

+2 −1
Original line number Diff line number Diff line
@@ -13,4 +13,5 @@ SOURCE[../../libcrypto]=\ 
        x_pkey.c bio_asn1.c bio_ndef.c asn_mime.c \

        asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_strnid.c \

        evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p5_scrypt.c p8_pkey.c \

        asn_moid.c asn_mstbl.c asn1_item_list.c
 
        asn_moid.c asn_mstbl.c asn1_item_list.c \

        d2i_param.c i2d_param.c

crypto/asn1/d2i_param.c

0 → 100644
+65 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2019 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the Apache License 2.0 (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/evp.h>

#include <openssl/asn1.h>

#include "internal/evp_int.h"

#include "internal/asn1_int.h"



EVP_PKEY *d2i_KeyParams(int type, EVP_PKEY **a, const unsigned char **pp,

                        long length)

{

    EVP_PKEY *ret = NULL;

    const unsigned char *p = *pp;



    if ((a == NULL) || (*a == NULL)) {

        if ((ret = EVP_PKEY_new()) == NULL)

            return NULL;

    } else

        ret = *a;



    if (type != EVP_PKEY_id(ret) && !EVP_PKEY_set_type(ret, type))

        goto err;



    if (ret->ameth == NULL || ret->ameth->param_decode == NULL) {

        ASN1err(ASN1_F_D2I_KEYPARAMS, ASN1_R_UNSUPPORTED_TYPE);

        goto err;

    }



    if (!ret->ameth->param_decode(ret, &p, length))

        goto err;



    if (a != NULL)

        (*a) = ret;

    return ret;

err:

    if (a == NULL || *a != ret)

        EVP_PKEY_free(ret);

    return NULL;

}



EVP_PKEY *d2i_KeyParams_bio(int type, EVP_PKEY **a, BIO *in)

{

    BUF_MEM *b = NULL;

    const unsigned char *p;

    void *ret = NULL;

    int len;



    len = asn1_d2i_read_bio(in, &b);

    if (len < 0)

        goto err;



    p = (unsigned char *)b->data;

    ret = d2i_KeyParams(type, a, &p, len);

err:

    BUF_MEM_free(b);

    return ret;

}

crypto/asn1/i2d_param.c

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2019 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the Apache License 2.0 (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/evp.h>

#include <openssl/objects.h>

#include <openssl/asn1.h>

#include "internal/asn1_int.h"

#include "internal/evp_int.h"



int i2d_KeyParams(const EVP_PKEY *a, unsigned char **pp)

{

    if (a->ameth != NULL && a->ameth->param_encode != NULL)

        return a->ameth->param_encode(a, pp);

    ASN1err(ASN1_F_I2D_KEYPARAMS, ASN1_R_UNSUPPORTED_TYPE);

    return -1;

}



int i2d_KeyParams_bio(BIO *bp, const EVP_PKEY *pkey)

{

    return ASN1_i2d_bio_of(EVP_PKEY, i2d_KeyParams, bp, pkey);

}

crypto/err/openssl.txt

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ ASN1_F_COLLECT_DATA:140:collect_data 
ASN1_F_D2I_ASN1_OBJECT:147:d2i_ASN1_OBJECT

ASN1_F_D2I_ASN1_UINTEGER:150:d2i_ASN1_UINTEGER

ASN1_F_D2I_AUTOPRIVATEKEY:207:d2i_AutoPrivateKey

ASN1_F_D2I_KEYPARAMS:144:d2i_KeyParams

ASN1_F_D2I_PRIVATEKEY:154:d2i_PrivateKey

ASN1_F_D2I_PUBLICKEY:155:d2i_PublicKey

ASN1_F_DO_BUF:142:do_buf
@@ -91,6 +92,7 @@ ASN1_F_I2D_ASN1_BIO_STREAM:211:i2d_ASN1_bio_stream 
ASN1_F_I2D_ASN1_OBJECT:143:i2d_ASN1_OBJECT

ASN1_F_I2D_DSA_PUBKEY:161:i2d_DSA_PUBKEY

ASN1_F_I2D_EC_PUBKEY:181:i2d_EC_PUBKEY

ASN1_F_I2D_KEYPARAMS:145:i2d_KeyParams

ASN1_F_I2D_PRIVATEKEY:163:i2d_PrivateKey

ASN1_F_I2D_PUBLICKEY:164:i2d_PublicKey

ASN1_F_I2D_RSA_PUBKEY:165:i2d_RSA_PUBKEY