diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2019-10-16 16:18:42 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2019-10-16 16:18:42 +1000 |
commit | 3d5a7578e09a984c6475b1c008f5c76f850328cb (patch) | |
tree | 0ec32eba328e21a6e1face34415c67dcdce365c2 /crypto/poly1305 | |
parent | 64fd90fbe99dde18de3fc7c3a6b06793d87a4aad (diff) |
Add ChaCha related ciphers to default provider
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10081)
Diffstat (limited to 'crypto/poly1305')
-rw-r--r-- | crypto/poly1305/poly1305.c | 1 | ||||
-rw-r--r-- | crypto/poly1305/poly1305_ameth.c | 1 | ||||
-rw-r--r-- | crypto/poly1305/poly1305_local.h | 27 |
3 files changed, 0 insertions, 29 deletions
diff --git a/crypto/poly1305/poly1305.c b/crypto/poly1305/poly1305.c index 97c0530500..127ce7da2f 100644 --- a/crypto/poly1305/poly1305.c +++ b/crypto/poly1305/poly1305.c @@ -12,7 +12,6 @@ #include <openssl/crypto.h> #include "crypto/poly1305.h" -#include "poly1305_local.h" size_t Poly1305_ctx_size(void) { diff --git a/crypto/poly1305/poly1305_ameth.c b/crypto/poly1305/poly1305_ameth.c index d69607c7bb..2feec9ccc3 100644 --- a/crypto/poly1305/poly1305_ameth.c +++ b/crypto/poly1305/poly1305_ameth.c @@ -12,7 +12,6 @@ #include <openssl/evp.h> #include "crypto/asn1.h" #include "crypto/poly1305.h" -#include "poly1305_local.h" #include "crypto/evp.h" /* diff --git a/crypto/poly1305/poly1305_local.h b/crypto/poly1305/poly1305_local.h deleted file mode 100644 index 23930c8ef4..0000000000 --- a/crypto/poly1305/poly1305_local.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2015-2016 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 - */ - -typedef void (*poly1305_blocks_f) (void *ctx, const unsigned char *inp, - size_t len, unsigned int padbit); -typedef void (*poly1305_emit_f) (void *ctx, unsigned char mac[16], - const unsigned int nonce[4]); - -struct poly1305_context { - double opaque[24]; /* large enough to hold internal state, declared - * 'double' to ensure at least 64-bit invariant - * alignment across all platforms and - * configurations */ - unsigned int nonce[4]; - unsigned char data[POLY1305_BLOCK_SIZE]; - size_t num; - struct { - poly1305_blocks_f blocks; - poly1305_emit_f emit; - } func; -}; |