Menu ▾ ▴

openssl_tpm_engine Merge Request #2: OpenSSL 1.1 compatibility and autotools improvement (open)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Matthias Gerstner wants to merge 13 commits from /u/matgerstner/openssl_tpm_engine/ to master, 2017-12-05

I'm not sure if development is still active here, and what the best way for contributions is. So I try it this way, please direct me to the proper place if this is wrong.

I've adapted the openssl_tpm_engine to OpenSSL 1.1 so it can still be used in upcoming Linux distributions that start shipping with OpenSSL 1.1 only. The changes are backwards compatible to OpenSSL 1.0 for the time being.

Along with this I've made some improvements in the build system and test area for easier packaging and testing.

It would be nice to see this accepted and a new release made for distributions to use.

Commit Date  
[415c8f] (HEAD, master) by Matthias Gerstner Matthias Gerstner

autotools: make engine plugin installation pkg-config aware and configurable

If a pkg-config enginesdir variable can be found, use that as default
engines installation dir. As a fallback use the previously hard coded
path.

Using --with-enginedir=/my/engine/dir the user can now choose the
target installation directory explicitly.

Some distributions like SUSE are placing engine plugins into different
directories for OpenSSL 1.0 and OpenSSL 1.1. This switch makes this
easier and allows packagers to drop custom patches.

 2017-12-04 16:54:12 Tree
[ff3ba3] by Matthias Gerstner Matthias Gerstner

autotools: renamed configure.in to fix bootstrap warning

this fixes the following bootstrap warning:

automake: warning: autoconf input should be named 'configure.ac', not 'configure.in'

 2017-12-04 16:53:08 Tree
[f10842] by Matthias Gerstner Matthias Gerstner

tests: work around a segfault during shutdown when running against 1.1.0

 2017-12-04 15:25:11 Tree
[a09394] by Matthias Gerstner Matthias Gerstner

tests: added some more informative output regarding the test progress

Most importantly output exit codes to avoid users thinking the test was
successful, although some error code was actually set and the test
aborted.

 2017-12-04 14:49:39 Tree
[ffd47f] by Matthias Gerstner Matthias Gerstner

tests: support custom SRK via environment variables

Otherwise the test will end prematurely without indication of why this
might be.

 2017-12-04 14:48:49 Tree
[7eb4f9] by Matthias Gerstner Matthias Gerstner

tests: free memory at some more locations so no memory leaks are reported by valgrind

 2017-12-04 14:47:52 Tree
[5e968f] by Matthias Gerstner Matthias Gerstner

gitignore: ignore build artifacts

 2017-12-04 11:03:55 Tree
[1e411d] by Matthias Gerstner Matthias Gerstner

autotools: choose engine plugin name based on OpenSSL version

In OpenSSL 1.1 engines are no longer prefixed with "lib" and also won't
be found if installed as lib<engine>.so. So this change checks for the
OpenSSL version we're compiling against and conditionally sets up
libtpm.so or just tpm.so.

 2017-12-01 16:27:18 Tree
[622772] by Matthias Gerstner Matthias Gerstner

automake: add linker flags to explicitly build a plugin instead of a regular library

 2017-12-01 16:22:07 Tree
[ade88c] by Matthias Gerstner Matthias Gerstner , pushed by Matthias Gerstner Matthias Gerstner

OpenSSL 1.1 compatibility

support compiling against both OpenSSL 1.0 and OpenSSL 1.1 by means of
suitable wrapper functions.

 2017-11-30 17:29:44 Tree
[e2b6c1] by Matthias Gerstner Matthias Gerstner , pushed by Matthias Gerstner Matthias Gerstner

Explicitly link create_tpm_key against libcrypto

 2017-11-30 12:48:16 Tree
[3d8e89] by Matthias Gerstner Matthias Gerstner , pushed by Matthias Gerstner Matthias Gerstner

openssl 1.1 compatibility preparation: fix warnings about losing const qualifier

 2017-11-30 12:07:59 Tree
[592eca] by Matthias Gerstner Matthias Gerstner , pushed by Matthias Gerstner Matthias Gerstner

openssl 1.1 compatibility preparation: remove unneeded setting of rsa->e

The fixed exponent is later set in fill_out_rsa_object. This piece of code is
thus useless.

 2017-11-30 11:58:39 Tree

Discussion

Log in to post a comment.