merge ENGINE-551
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Fri, 17 May 2019 16:35:36 +0200
branchENGINE-551
changeset 372614f9e0f35945
parent 3724 c878a420db18
parent 3719 6806be48b327
child 3727 d926613299bf
child 3731 ecd9059f224d
merge
     1.1 --- a/src/pgp_netpgp.h	Fri May 17 16:33:52 2019 +0200
     1.2 +++ b/src/pgp_netpgp.h	Fri May 17 16:35:36 2019 +0200
     1.3 @@ -108,3 +108,11 @@
     1.4  
     1.5  // Stub - just returns PEP_STATUS_OK, as netpgp isn't sufficient to do this.
     1.6  PEP_STATUS pgp_import_ultimately_trusted_keypairs(PEP_SESSION session);
     1.7 +
     1.8 +PEP_STATUS pgp_config_cipher_suite(PEP_SESSION session, PEP_CIPHER_SUITE suite) {
     1.9 +    if (suite == PEP_CIPHER_SUITE_DEFAULT) {
    1.10 +        return PEP_STATUS_OK;
    1.11 +    } else {
    1.12 +        return PEP_CANNOT_CONFIG;
    1.13 +    }
    1.14 +}