meson: add -Duse_crypto and -Duse_crypto25519 options

Signed-off-by: Steven Noonan <[email protected]>

Author: Steven Noonan

.travis/build-meson.sh

@@ -7,7 +7,7 @@ set -e
 
 cleanup() {
 	echo "Cleaning up Meson build directories" >&2
-	rm -rf build-meson
+	rm -rf build-meson build-meson-ref
 }
 
 trap cleanup EXIT
@@ -22,12 +22,15 @@ set -x
 
 # Build lightweight test builds
 meson . build-meson ${MESON_ARGS[@]} --buildtype debugoptimized
+meson . build-meson-ref ${MESON_ARGS[@]} --buildtype debugoptimized -Duse_crypto25519=Reference
 
-# Build all targets of CMake/meson, ensuring everything can build.
+# Build all targets
 ninja -v -C build-meson
+ninja -v -C build-meson-ref
 
 # Run basic tests
 build-meson/tests/test_crypto
+build-meson-ref/tests/test_crypto
 
 set +x
 

meson.build

@@ -51,6 +51,11 @@ if werror
   warn_flags_common += [ '-Werror' ]
 endif
 
+use_crypto_25519 = get_option('use_crypto25519')
+if use_crypto_25519 == 'Reference'
+  warn_flags_common += [ '-Wno-unused-function' ]
+endif
+
 warn_flags_c = [
   '-Wimplicit',
   '-Wstrict-prototypes',

meson_options.txt

@@ -8,7 +8,14 @@ option('Werror',
   value: false,
   description: 'Enable -Werror flag when compiling')
 
-option('use_bcrypt',
-  type: 'boolean',
-  value: false,
-  description: 'Use BCrypt API for cryptography (encryption/decryption, hashing) on Windows')
+option('use_crypto',
+  type: 'combo',
+  value: 'OpenSSL',
+  description: 'Crypto library to use for AES/SHA256',
+  choices: ['OpenSSL', 'BCrypt'])
+
+option('use_crypto25519',
+  type: 'combo',
+  value: 'OpenSSL',
+  description: 'Crypto library to use for ed25519/curve25519',
+  choices: ['OpenSSL', 'Reference'])

src/meson.build

@@ -7,9 +7,10 @@ protoc = generator(protoc_bin,
   output    : ['@[email protected]', '@[email protected]'],
   arguments : ['-I@CURRENT_SOURCE_DIR@/common', '--proto_path=@CURRENT_SOURCE_DIR@', '--cpp_out=@BUILD_DIR@', '@INPUT@'])
 
-use_bcrypt = get_option('use_bcrypt')
+use_crypto = get_option('use_crypto')
+use_crypto25519 = get_option('use_crypto25519')
 
-if not use_bcrypt
+if use_crypto == 'OpenSSL' or use_crypto25519 == 'OpenSSL'
   min_libcrypto = dependency('libcrypto', version: '>=1.1.0')
   good_libcrypto = dependency('libcrypto', version: '>=1.1.1', required: false)
 
@@ -19,6 +20,10 @@ if not use_bcrypt
     dependencies += [ min_libcrypto ]
   endif
 
+  if use_crypto25519 == 'OpenSSL' and not good_libcrypto.found()
+    error('This version of OpenSSL does not support ed25519/curve25519. Please use -Duse_crypto25519=Reference or upgrade OpenSSL to 1.1.1 or later.')
+  endif
+
   code = '''#include <openssl/evp.h>
   int main(int argc, char **argv) {
     EVP_MD_CTX_free(NULL);
@@ -83,26 +88,26 @@ sources = [
   'vstdlib/strtools.cpp',
 ]
 
-if use_bcrypt
-  dependencies += [ c_compiler.find_library('bcrypt') ]
-  sources += [ 'common/crypto_bcrypt.cpp' ]
-  cpp_flags += [ '-DED25519_HASH_BCRYPT', '-DSTEAMNETWORKINGSOCKETS_CRYPTO_BCRYPT' ]
-else
+if use_crypto == 'OpenSSL'
   cpp_flags += [ '-DSTEAMNETWORKINGSOCKETS_CRYPTO_VALVEOPENSSL' ]
   sources += [
     'common/opensslwrapper.cpp',
     'common/crypto_openssl.cpp',
   ]
+endif
 
-  # Use OpenSSL for 25519 if possible
-  if good_libcrypto.found()
-    cpp_flags += [ '-DSTEAMNETWORKINGSOCKETS_CRYPTO_25519_OPENSSL' ]
-    sources += [ 'common/crypto_25519_openssl.cpp' ]
-  endif
+if use_crypto == 'BCrypt'
+  dependencies += [ c_compiler.find_library('bcrypt') ]
+  cpp_flags += [ '-DED25519_HASH_BCRYPT', '-DSTEAMNETWORKINGSOCKETS_CRYPTO_BCRYPT' ]
+  sources += [ 'common/crypto_bcrypt.cpp' ]
+endif
+
+if use_crypto25519 == 'OpenSSL'
+  cpp_flags += [ '-DSTEAMNETWORKINGSOCKETS_CRYPTO_25519_OPENSSL' ]
+  sources += [ 'common/crypto_25519_openssl.cpp' ]
 endif
 
-# Use reference 25519 crypto implementation?
-if use_bcrypt or not good_libcrypto.found()
+if use_crypto25519 == 'Reference'
   cpp_flags += [ '-DVALVE_CRYPTO_25519_DONNA' ]
   sources += [
     'common/crypto_25519_donna.cpp',