Differential D16248

Fix build with botan < 2 and openssl < 1.1
ClosedPublic
Actions

Authored by volkov on Oct 16 2018, 11:01 AM.

Details

Reviewers
dfaure
bcooksley
Commits
R486:32343842d359: Fix build with botan < 2 and openssl < 1.1
Summary

This commit amends f57d661416ecbdfbf9c16d8116c296cfdcbeb7d6.
HKDF support was added only in the new versions of the libs.

Diff Detail

Repository
R486 QCA Library
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 3943
Build 3961: arc lint + arc unit
volkov requested review of this revision.Oct 16 2018, 11:01 AM
volkov created this revision.
bcooksley added a comment.Oct 17 2018, 5:51 AM

Thanks, this looks correct to me - David, is this okay with you as well?

dfaure added inline comments.Oct 17 2018, 7:10 AM
plugins/qca-ossl/qca-ossl.cpp
1283

Shouldn't this (and other similar ifdefs) be

#if defined (OSSL_1110) && BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(2,0,0)

?
If OSSL is recent enough but botan is too old, the base class HKDFContext won't be available.

volkov added inline comments.Oct 17 2018, 10:36 AM
plugins/qca-ossl/qca-ossl.cpp
1283

Plugins are independent of each other.
If OSSL is recent enough, then qca-ossl will support HKDF.
If botan is too old, then qca-botan will not support HKDF.
HKDFContext is an abstract class, what do you mean by "won't be available"?

dfaure accepted this revision.Oct 17 2018, 11:51 AM

Ah sorry I read too fast and I confused HKDFContext et BotanHKDFContext.

This revision is now accepted and ready to land.Oct 17 2018, 11:51 AM
volkov closed this revision.Oct 17 2018, 11:55 AM

Revision Contents
Changeset List

Diff 43725

View Options

plugins/qca-botan/qca-botan.cpp

Loading...
View Options

plugins/qca-ossl/qca-ossl.cpp

Loading...