aboutsummaryrefslogtreecommitdiff
path: root/crypto/asn1/standard_methods.h
diff options
context:
space:
mode:
authorTodd Short <tshort@akamai.com>2016-12-16 17:00:43 -0500
committerRichard Levitte <levitte@openssl.org>2017-01-24 15:40:37 +0100
commit52ad5b60e3a1fef12a1a5ea01527a90b8f92a34b (patch)
tree74ef6b469ac271f35b5573738ca00edf38cff89e /crypto/asn1/standard_methods.h
parent07afdf3c3ac97af4f2b4eec22a97f7230f8227e0 (diff)
downloadopenssl-52ad5b60e3a1fef12a1a5ea01527a90b8f92a34b.zip
openssl-52ad5b60e3a1fef12a1a5ea01527a90b8f92a34b.tar.gz
openssl-52ad5b60e3a1fef12a1a5ea01527a90b8f92a34b.tar.bz2
Add support for Poly1305 in EVP_PKEY
Add Poly1305 as a "signed" digest. Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2128)
Diffstat (limited to 'crypto/asn1/standard_methods.h')
-rw-r--r--crypto/asn1/standard_methods.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/asn1/standard_methods.h b/crypto/asn1/standard_methods.h
index 322ba97..ca38b09 100644
--- a/crypto/asn1/standard_methods.h
+++ b/crypto/asn1/standard_methods.h
@@ -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
};