Commit c26f655f authored by Emilia Kasper's avatar Emilia Kasper
Browse files

Remove support for HMAC_TEST_PRIVATE_KEY_FORMAT 



This is a bogus, undocumented format that was intended for testing; I
don't think anyone is using it.

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

crypto/hmac/hm_ameth.c

+0 −54
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ 
#include <openssl/evp.h>

#include "internal/asn1_int.h"



#define HMAC_TEST_PRIVATE_KEY_FORMAT



/*

 * HMAC "ASN1" method. This is just here to indicate the maximum HMAC output

 * length and to free up an HMAC key.
@@ -51,53 +49,6 @@ static int hmac_pkey_public_cmp(const EVP_PKEY *a, const EVP_PKEY *b) 
    return ASN1_OCTET_STRING_cmp(EVP_PKEY_get0(a), EVP_PKEY_get0(b));

}



#ifdef HMAC_TEST_PRIVATE_KEY_FORMAT

/*

 * A bogus private key format for test purposes. This is simply the HMAC key

 * with "HMAC PRIVATE KEY" in the headers. When enabled the genpkey utility

 * can be used to "generate" HMAC keys.

 */



static int old_hmac_decode(EVP_PKEY *pkey,

                           const unsigned char **pder, int derlen)

{

    ASN1_OCTET_STRING *os;

    os = ASN1_OCTET_STRING_new();

    if (os == NULL || !ASN1_OCTET_STRING_set(os, *pder, derlen))

        goto err;

    if (!EVP_PKEY_assign(pkey, EVP_PKEY_HMAC, os))

        goto err;

    return 1;



 err:

    ASN1_OCTET_STRING_free(os);

    return 0;

}



static int old_hmac_encode(const EVP_PKEY *pkey, unsigned char **pder)

{

    int inc;

    ASN1_OCTET_STRING *os = EVP_PKEY_get0(pkey);

    if (pder) {

        if (!*pder) {

            *pder = OPENSSL_malloc(os->length);

            if (*pder == NULL)

                return -1;

            inc = 0;

        } else

            inc = 1;



        memcpy(*pder, os->data, os->length);



        if (inc)

            *pder += os->length;

    }



    return os->length;

}



#endif



const EVP_PKEY_ASN1_METHOD hmac_asn1_meth = {

    EVP_PKEY_HMAC,

    EVP_PKEY_HMAC,
@@ -116,10 +67,5 @@ const EVP_PKEY_ASN1_METHOD hmac_asn1_meth = { 


    hmac_key_free,

    hmac_pkey_ctrl,

#ifdef HMAC_TEST_PRIVATE_KEY_FORMAT

    old_hmac_decode,

    old_hmac_encode

#else

    0, 0

#endif

};