Differential D11997

Add botan 2 support
ClosedPublic
Actions

Authored by arojas on Apr 6 2018, 9:00 PM.

Details

Reviewers
iromanov
fvogt
Commits
R486:78503bf5743c: Recommit botan 2 support without making botan mandatory
R486:47163784d742: Add botan 2 support
Summary

Botan 1.10 will be EOL'd this year. This patch is a rough port to botan 2 API. Also:

  • Removes support for botan < 1.10 to simplify code (1.10 was released 7 years ago)
  • Ports the cmake module to use pkgconfig, since botan-config doesn't exist anymore in v2.
  • To minimize ifdef'd code, botan2 unique_ptr's are release'd

This only works with Qt5, since botan2 needs C++11. Not sure if there are any further qt4 releases planned (EDIT: fixed in latest revision)

Test Plan

Builds with botan 1.10 and botan 2, tests pass except for one that didn't pass with 1.10 either.

Diff Detail

Repository
R486 QCA Library
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
arojas requested review of this revision.Apr 6 2018, 9:00 PM
arojas created this revision.
fvogt requested changes to this revision.Apr 6 2018, 9:09 PM
fvogt added a subscriber: fvogt.
fvogt added inline comments.
plugins/qca-botan/qca-botan.cpp
330

AFAICT this leaks the algorithm object.

This revision now requires changes to proceed.Apr 6 2018, 9:09 PM
arojas updated this revision to Diff 31527.Apr 6 2018, 10:33 PM

Use unique_ptr's to prevent leaks

arojas marked an inline comment as done.Apr 6 2018, 10:36 PM
arojas updated this revision to Diff 31544.Apr 7 2018, 1:34 AM
arojas edited the summary of this revision. (Show Details)

Remove -ansi CFLAGS that conflict with c++11 needed by botan2

fvogt accepted this revision.Apr 7 2018, 8:49 AM
This revision is now accepted and ready to land.Apr 7 2018, 8:49 AM
Closed by commit R486:47163784d742: Add botan 2 support (authored by arojas). · Explain WhyApr 11 2018, 7:45 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 31918

View Options

CMakeLists.txt

Loading...
View Options

cmake/modules/FindBotan.cmake

Loading...
View Options

plugins/qca-botan/qca-botan.cpp

Loading...