aboutsummaryrefslogtreecommitdiff
path: root/crypto/include
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2015-12-09 23:02:11 +0100
committerAndy Polyakov <appro@openssl.org>2015-12-10 12:05:50 +0100
commit48f14845551c530ed42834d8034d53222d355175 (patch)
tree95208bc12fe7e701d641c0664da3a9a9088811c0 /crypto/include
parenta76ba82ccbfee6df5aa86ba2a275b713f3e0f239 (diff)
downloadopenssl-48f14845551c530ed42834d8034d53222d355175.zip
openssl-48f14845551c530ed42834d8034d53222d355175.tar.gz
openssl-48f14845551c530ed42834d8034d53222d355175.tar.bz2
Configure: make no-chacha and no-poly1305 work.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/include')
-rw-r--r--crypto/include/internal/chacha.h4
-rw-r--r--crypto/include/internal/poly1305.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/crypto/include/internal/chacha.h b/crypto/include/internal/chacha.h
index dacbdf5..98787d3 100644
--- a/crypto/include/internal/chacha.h
+++ b/crypto/include/internal/chacha.h
@@ -57,6 +57,10 @@
extern "C" {
#endif
+# ifdef OPENSSL_NO_CHACHA
+# error CHACHA is disabled.
+# endif
+
/*
* ChaCha20_ctr32 encrypts |len| bytes from |inp| with the given key and
* nonce and writes the result to |out|, which may be equal to |inp|.
diff --git a/crypto/include/internal/poly1305.h b/crypto/include/internal/poly1305.h
index 8e2cac5..b6db325 100644
--- a/crypto/include/internal/poly1305.h
+++ b/crypto/include/internal/poly1305.h
@@ -49,6 +49,10 @@
*/
#include <stddef.h>
+#ifdef OPENSSL_NO_POLY1305
+# error POLY1305 is disabled.
+#endif
+
#define POLY1305_BLOCK_SIZE 16
typedef struct poly1305_context POLY1305;