]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #22226 into mimic
authorSage Weil <sage@redhat.com>
Sat, 26 May 2018 13:38:09 +0000 (08:38 -0500)
committerSage Weil <sage@redhat.com>
Sat, 26 May 2018 13:38:09 +0000 (08:38 -0500)
* refs/pull/22226/head:
tests/crypto: print compile warning when NSS is unavailable.
tests/crypto: add tests for the no-bl encrypt/decrypt, part 2.
tests/crypto: add tests for the no-bl encrypt/decrypt.
auth: use OpenSSL for CryptoAESKeyHandler's no-bl encrypt/decrypt.
auth: extend CryptoKey with no-bl encrypt/decrypt.
auth: CryptoAESKeyHandler switches from NSS to OpenSSL.
auth: the outbuf of AES should be multiple of block size
auth: cache the PK11Context for CryptoAESKeyHandler

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Trivial merge