crypto-openssl: chacha support in openssl version 83/30683/5
authorRay Kinsella <mdr@ashroe.eu>
Mon, 11 Jan 2021 12:01:49 +0000 (12:01 +0000)
committerNeale Ranns <neale@graphiant.com>
Tue, 12 Jan 2021 13:10:21 +0000 (13:10 +0000)
Fix build errors related to chachapoly when the
system openssl version is < 0x10100000.

Type: fix

Signed-off-by: Ray Kinsella <mdr@ashroe.eu>
Change-Id: I62283fcc44c952ddd4d6a9f621c18e8be1af8af1

src/plugins/crypto_openssl/main.c

index 020e330..ad6ebc6 100644 (file)
@@ -253,10 +253,10 @@ openssl_ops_enc_gcm (vlib_main_t * vm, vnet_crypto_op_t * ops[],
                               /* is_gcm */ 1);
 }
 
-static_always_inline u32
-openssl_ops_enc_chacha20_poly1305 (vlib_main_t * vm, vnet_crypto_op_t * ops[],
-                                  vnet_crypto_op_chunk_t * chunks, u32 n_ops,
-                                  const EVP_CIPHER * cipher)
+static_always_inline __clib_unused u32
+openssl_ops_enc_chacha20_poly1305 (vlib_main_t *vm, vnet_crypto_op_t *ops[],
+                                  vnet_crypto_op_chunk_t *chunks, u32 n_ops,
+                                  const EVP_CIPHER *cipher)
 {
   return openssl_ops_enc_aead (vm, ops, chunks, n_ops, cipher,
                               /* is_gcm */ 0);
@@ -317,10 +317,10 @@ openssl_ops_dec_gcm (vlib_main_t * vm, vnet_crypto_op_t * ops[],
                               /* is_gcm */ 1);
 }
 
-static_always_inline u32
-openssl_ops_dec_chacha20_poly1305 (vlib_main_t * vm, vnet_crypto_op_t * ops[],
-                                  vnet_crypto_op_chunk_t * chunks, u32 n_ops,
-                                  const EVP_CIPHER * cipher)
+static_always_inline __clib_unused u32
+openssl_ops_dec_chacha20_poly1305 (vlib_main_t *vm, vnet_crypto_op_t *ops[],
+                                  vnet_crypto_op_chunk_t *chunks, u32 n_ops,
+                                  const EVP_CIPHER *cipher)
 {
   return openssl_ops_dec_aead (vm, ops, chunks, n_ops, cipher,
                               /* is_gcm */ 0);