OpenSSL cipher mapping in trunk now works (i.e. tests pass) with 1.0.2. Need to test with 1.1.0 - I suspect some 'tweaks' will be required.