Commit 52ad5b60 authored by Todd Short's avatar Todd Short Committed by Richard Levitte
Browse files

Add support for Poly1305 in EVP_PKEY 



Add Poly1305 as a "signed" digest.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2128)
parent 07afdf3c

crypto/asn1/standard_methods.h

+4 −1
Original line number Diff line number Diff line
@@ -41,7 +41,10 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = { 
    &dhx_asn1_meth,

#endif

#ifndef OPENSSL_NO_EC

    &ecx25519_asn1_meth

    &ecx25519_asn1_meth,

#endif

#ifndef OPENSSL_NO_POLY1305

    &poly1305_asn1_meth,

#endif

};

crypto/evp/evp_err.c

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

 * Generated by util/mkerr.pl DO NOT EDIT

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

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

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -64,6 +64,7 @@ static ERR_STRING_DATA EVP_str_functs[] = { 
    {ERR_FUNC(EVP_F_EVP_PKEY_GET0_DSA), "EVP_PKEY_get0_DSA"},

    {ERR_FUNC(EVP_F_EVP_PKEY_GET0_EC_KEY), "EVP_PKEY_get0_EC_KEY"},

    {ERR_FUNC(EVP_F_EVP_PKEY_GET0_HMAC), "EVP_PKEY_get0_hmac"},

    {ERR_FUNC(EVP_F_EVP_PKEY_GET0_POLY1305), "EVP_PKEY_get0_poly1305"},

    {ERR_FUNC(EVP_F_EVP_PKEY_GET0_RSA), "EVP_PKEY_get0_RSA"},

    {ERR_FUNC(EVP_F_EVP_PKEY_KEYGEN), "EVP_PKEY_keygen"},

    {ERR_FUNC(EVP_F_EVP_PKEY_KEYGEN_INIT), "EVP_PKEY_keygen_init"},
@@ -114,6 +115,7 @@ static ERR_STRING_DATA EVP_str_reasons[] = { 
    {ERR_REASON(EVP_R_EXPECTING_A_DH_KEY), "expecting a dh key"},

    {ERR_REASON(EVP_R_EXPECTING_A_DSA_KEY), "expecting a dsa key"},

    {ERR_REASON(EVP_R_EXPECTING_A_EC_KEY), "expecting a ec key"},

    {ERR_REASON(EVP_R_EXPECTING_A_POLY1305_KEY), "expecting a poly1305 key"},

    {ERR_REASON(EVP_R_FIPS_MODE_NOT_SUPPORTED), "fips mode not supported"},

    {ERR_REASON(EVP_R_ILLEGAL_SCRYPT_PARAMETERS),

     "illegal scrypt parameters"},

crypto/evp/p_lib.c

+14 −0
Original line number Diff line number Diff line
@@ -249,6 +249,20 @@ const unsigned char *EVP_PKEY_get0_hmac(const EVP_PKEY *pkey, size_t *len) 
    return os->data;

}



#ifndef OPENSSL_NO_POLY1305

const unsigned char *EVP_PKEY_get0_poly1305(const EVP_PKEY *pkey, size_t *len)

{

    ASN1_OCTET_STRING *os = NULL;

    if (pkey->type != EVP_PKEY_POLY1305) {

        EVPerr(EVP_F_EVP_PKEY_GET0_POLY1305, EVP_R_EXPECTING_A_POLY1305_KEY);

        return NULL;

    }

    os = EVP_PKEY_get0(pkey);

    *len = os->length;

    return os->data;

}

#endif



#ifndef OPENSSL_NO_RSA

int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key)

{

crypto/evp/pmeth_lib.c

+4 −1
Original line number Diff line number Diff line
@@ -48,7 +48,10 @@ static const EVP_PKEY_METHOD *standard_methods[] = { 
#ifndef OPENSSL_NO_EC

    &ecx25519_pkey_meth,

#endif

    &hkdf_pkey_meth

    &hkdf_pkey_meth,

#ifndef OPENSSL_NO_POLY1305

    &poly1305_pkey_meth,

#endif

};



DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_METHOD *, const EVP_PKEY_METHOD *,

crypto/include/internal/asn1_int.h

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ extern const EVP_PKEY_ASN1_METHOD dhx_asn1_meth; 
extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[5];

extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth;

extern const EVP_PKEY_ASN1_METHOD ecx25519_asn1_meth;

extern const EVP_PKEY_ASN1_METHOD poly1305_asn1_meth;



extern const EVP_PKEY_ASN1_METHOD hmac_asn1_meth;

extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[2];

extern const EVP_PKEY_ASN1_METHOD rsa_pss_asn1_meth;