From 9cfd25329a4dc1e1495b24e3dae0313a2e6a60f7 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Mon, 27 Jan 2020 17:41:11 +0200 Subject: pluginloader: generate keys by meson --- lib/pluginloader/meson.build | 18 +++++++++++++----- lib/pluginloader/ssl-keygen.py | 15 --------------- 2 files changed, 13 insertions(+), 20 deletions(-) (limited to 'lib') diff --git a/lib/pluginloader/meson.build b/lib/pluginloader/meson.build index 534f385..acdd47e 100644 --- a/lib/pluginloader/meson.build +++ b/lib/pluginloader/meson.build @@ -1,14 +1,24 @@ python = import('python') python3 = python.find_installation('python3') -private_pem = meson.build_root() / get_option('ssl_private_pem') -public_pem = meson.build_root() / get_option('ssl_public_pem') +openssl = find_program('openssl', required: true) + +private_pem = custom_target('privateKey.pem', + output: 'privateKey.pem', + command: [ openssl, 'genrsa', '-out', '@OUTPUT@', '4096' ] +) + +public_pem = custom_target('publicKey.pem', + input: private_pem, + output: 'publicKey.pem', + command: [ openssl, 'rsa', '-in', '@INPUT@', '-pubout', '-out', '@OUTPUT@' ] +) publicKey_h = custom_target('publicKey_h', input: files('ssl-keygen.py'), output: 'publicKey.h', command: [python3, '@INPUT@', - '--private=' + private_pem, '--public=' + public_pem, + '--private', private_pem, '--public', public_pem, '--output=@OUTPUT@', '--array-name=publicKey_pem'] ) @@ -25,8 +35,6 @@ dep_pluginloader = declare_dependency( dependencies: [dep_qt5, dependency('openssl', required: true)]) ) -openssl = find_program('openssl', required: true) - # generate a test file that would be signed signedfile_dat = custom_target('signedfile.dat', input: 'write-random.py', diff --git a/lib/pluginloader/ssl-keygen.py b/lib/pluginloader/ssl-keygen.py index 7feaf1a..a1a70c4 100755 --- a/lib/pluginloader/ssl-keygen.py +++ b/lib/pluginloader/ssl-keygen.py @@ -6,12 +6,6 @@ import os.path import subprocess from functools import partial -def generate_private_key(out_pem='privateKey.pem'): - subprocess.run(['openssl', 'genrsa', '-out', out_pem, '4096'], check=True) - -def generate_public_key(in_pem='privateKey.pem', out_pem='publicKey.pem'): - subprocess.run(['openssl', 'rsa', '-in', in_pem, '-pubout', '-out', out_pem], check=True) - def hexdump(array_type, array_name, length_type, in_pem, out_h): array_len = 0 @@ -43,15 +37,6 @@ if __name__ == "__main__": args=parser.parse_args() - # check if public key exists - if not os.path.isfile(args.public): - # if there is no private key, generate one - if not os.path.isfile(args.private): - generate_private_key(args.private) - - # export public key from private - generate_public_key(args.private, args.public) - with open(args.public, "rb") as public_pem: hexdump(args.array_type, args.array_name, args.length_type, public_pem, args.output) -- cgit v1.2.1