Commit 245c6bc3 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Constify private key decode. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent ac4e2577

crypto/asn1/ameth_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth, 


void EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth,

                               int (*priv_decode) (EVP_PKEY *pk,

                                                   PKCS8_PRIV_KEY_INFO

                                                   const PKCS8_PRIV_KEY_INFO

                                                   *p8inf),

                               int (*priv_encode) (PKCS8_PRIV_KEY_INFO *p8,

                                                   const EVP_PKEY *pk),

crypto/asn1/p8_pkey.c

+2 −2
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ int PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj, 
    return 1;

}



int PKCS8_pkey_get0(ASN1_OBJECT **ppkalg,

int PKCS8_pkey_get0(const ASN1_OBJECT **ppkalg,

                    const unsigned char **pk, int *ppklen,

                    X509_ALGOR **pa, PKCS8_PRIV_KEY_INFO *p8)

                    const X509_ALGOR **pa, const PKCS8_PRIV_KEY_INFO *p8)

{

    if (ppkalg)

        *ppkalg = p8->pkeyalg->algorithm;

crypto/dh/dh_ameth.c

+2 −2
Original line number Diff line number Diff line
@@ -147,14 +147,14 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) 
 * explicitly included and the pubkey must be recalculated.

 */



static int dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)

static int dh_priv_decode(EVP_PKEY *pkey, const PKCS8_PRIV_KEY_INFO *p8)

{

    const unsigned char *p, *pm;

    int pklen, pmlen;

    int ptype;

    const void *pval;

    const ASN1_STRING *pstr;

    X509_ALGOR *palg;

    const X509_ALGOR *palg;

    ASN1_INTEGER *privkey = NULL;



    DH *dh = NULL;

crypto/dsa/dsa_ameth.c

+2 −2
Original line number Diff line number Diff line
@@ -130,14 +130,14 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) 
 * AlgorithmIdentifier the pubkey must be recalculated.

 */



static int dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)

static int dsa_priv_decode(EVP_PKEY *pkey, const PKCS8_PRIV_KEY_INFO *p8)

{

    const unsigned char *p, *pm;

    int pklen, pmlen;

    int ptype;

    const void *pval;

    const ASN1_STRING *pstr;

    X509_ALGOR *palg;

    const X509_ALGOR *palg;

    ASN1_INTEGER *privkey = NULL;

    BN_CTX *ctx = NULL;

crypto/ec/ec_ameth.c

+2 −2
Original line number Diff line number Diff line
@@ -179,13 +179,13 @@ static int eckey_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b) 
    return -2;

}



static int eckey_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)

static int eckey_priv_decode(EVP_PKEY *pkey, const PKCS8_PRIV_KEY_INFO *p8)

{

    const unsigned char *p = NULL;

    const void *pval;

    int ptype, pklen;

    EC_KEY *eckey = NULL;

    X509_ALGOR *palg;

    const X509_ALGOR *palg;



    if (!PKCS8_pkey_get0(NULL, &p, &pklen, &palg, p8))

        return 0;