4
0
mirror of https://github.com/QuasarApp/qca.git synced 2025-05-11 02:09:33 +00:00

2231 Commits

Author SHA1 Message Date
Harald Sitter
e44d0a335e bump version to 2.1.1 v2.1.1 2015-10-02 11:35:20 +02:00
Harald Sitter
4f966b0217 Merge branch 'master' into qt5 2015-09-24 10:49:28 +02:00
Jan Grulich
66b9754170 Use Q_SLOTS/Q_SIGNALS instead of slots/signals in all headers from include dir
REVIEW:125289
2015-09-17 16:14:24 +02:00
Harald Sitter
088ff642fc Merge branch 'master' into qt5 2015-04-22 13:07:32 +02:00
Samuel Gaist
4fd11c444a Link against CoreFoundation rather than Carbon
Currently qca links to the Carbon framework for building however the mac
specific code don't use any Carbon classes but CoreFoundation. This patch
aims to update the code and build script to link to the more generic
CoreFoundation framework which may also allow to build it on iOS (not
verified).

REVIEW: 121703
2015-04-22 13:06:26 +02:00
Hrvoje Senjan
cc418554ad Merge remote-tracking branch 'origin/master' into qt5 2015-01-17 20:13:00 +01:00
Hrvoje Senjan
7207e6285e Add missing QIODevice include
Fixes build with Qt 5.5
2015-01-17 20:12:18 +01:00
Raphael Kubo da Costa
d4e9444f9d Do not end Cipher::Mode with a comma.
This solves a build failure with compilers such as GCC 4.2:
/usr/local/include/QtCrypto/qca_basic.h:598: error: comma at end of enumerator list

REVIEW: 122107
2015-01-17 15:21:20 +02:00
Harald Sitter
e40307d108 Merge remote-tracking branch 'origin/master' into qt5 2015-01-15 00:25:32 +01:00
Raphael Kubo da Costa
19aeaedd54 cmake: Make the check for QC_CERTSTORE_PATH actually work.
The previous code (present since the file was created) mixed different
checks that required different expansions:

* `if (ENV{foo})' will always evaluate to false even if $ENV{foo} is
  set, and may even be a CMake bug.
* `if (EXISTS ...)' expects an actual string, not an variable that has
  not been expanded.

It is not clear why the code expects QC_CERTSTORE_PATH to be an
environment variable instead of a regular variable passed to CMake in
the first place, but that can be changed in another commit.

REVIEW: 122062
2015-01-15 00:31:45 +02:00
Harald Sitter
b596e937b8 Revert "Revert "initialize QCA_SUFFIX cache with the possibly previously set SUFFIX""
This reverts commit c9f85b4dcab920d97a0959336ec71bc155209ccf.
2015-01-14 13:51:10 +01:00
Harald Sitter
b7f47694f8 Revert "Revert "properly support co-existing qt4 and qt5 versions""
This reverts commit 99128312fb91bc5f8e6320fe052bbaf7648102fe.
2015-01-14 13:51:07 +01:00
Ivan Romanov
99128312fb Revert "properly support co-existing qt4 and qt5 versions"
It's not properly. Martin Klapetek is not QCA developer. So it's not
correct that he said "Ship it!".

Properly way

cmake -DQCA_SUFFIX=qt5 ...

and in CMakeLists.txt of your project.

find_package(Qca NAMES Qca-qt5)

This reverts commit c32bc6f1bc9befe5f89d3572eb28e0d591a2e3b2.
2015-01-14 15:26:33 +05:00
Ivan Romanov
c9f85b4dca Revert "initialize QCA_SUFFIX cache with the possibly previously set SUFFIX"
I don't agree with this changes see https://git.reviewboard.kde.org/r/121168/
for details.

This reverts commit 3e3533b2753c8e47f0d22b77b564a0a6332cd5b8.
2015-01-14 15:24:11 +05:00
Harald Sitter
3e3533b275 initialize QCA_SUFFIX cache with the possibly previously set SUFFIX
this prevents us from unsetting what was previously set, making sure
the suffix is applied
2015-01-13 17:22:06 +01:00
Harald Sitter
c32bc6f1bc properly support co-existing qt4 and qt5 versions
- if QT4_BUILD is not defined *and* Qt5Core is found build with soname
  qca-qt5
- rename cmake package to reflect the suffix i.e. with a Qt5 build it is
  find_package(Qca-qt5) rather than find_package(Qca)
- the imported cmake target also reflects suffix so "Qca-qt5" is the
  cmake link target for qt5 and "Qca" for qt4 builds

this retains 100% compatibility with regular qca while also offering 100%
coinstallability of the qt5 build.

REVIEW: 121633
2014-12-28 14:26:50 +01:00
Harald Sitter
ffc53703ad put headers of a suffixed build in a suffixed directory
this makes the headers co-installable between a suffixed and regular
version

reviewed as part of r121323
2014-12-22 12:50:18 +01:00
Harald Sitter
4aae2dee34 prevent filewatches from emitting changes when there is no file
(this also fixes the flaky filewatch test that would fail for example on
 ubuntu launchpad builds)

it can happen that (supposedly for filesystem reasons) there are two
changes signals arriving in the watcher code, by the time the first arrives
the file would however already be deleted, by the time the second arrives
it would thus notify of changes to a file that does not exist which is
silly and causes problems with the filewatchtest as it uses signal emission
counting to verify the behavior.
to prevent this problem from popping up there is an additional save guard
in the file_changed slot that will ignore a change if the path in question
doesn't exist AND there is no file being watched by the watcher.

REVIEW: 121588
2014-12-19 16:47:40 +01:00
Harald Sitter
3b1bb19c7c add a reviewboardrc
REVIEW: 121325
2014-12-18 12:27:04 +01:00
Ivan Romanov
e57f8e7795 fixed array size checking
BUG: 341827
2014-12-13 01:54:53 +05:00
Harald Sitter
a67d31b1ec move QCA_CONFIG_NAME_BASE definition in the regular suffix if
(reviewed as part of r121323)
2014-12-02 13:32:09 +01:00
Harald Sitter
02be30908f fix library name in prf file to use the lib name variable
the lib name might be suffixed

(reviewed as part of r121323)
2014-12-02 13:29:52 +01:00
Ivan Romanov
9a9c16dfd1 cmake: fixed cmake config module when used QCA_SUFFIX 2014-11-29 00:57:31 +05:00
Ivan Romanov
98be0a1234 docs: fixed no images in docs when build out of source 2014-11-28 23:50:13 +05:00
Ivan Romanov
95223e9ee3 cmake: fixed warnings on android
do not use -Wcast-align on arm
2014-11-27 01:57:24 +05:00
Ivan Romanov
c8008de37b simplified md5_state_t and SHA1_CONTEXT internal structs
On arm is not correct to do int* = char* and throw warning. int must
be aligned unlike i686 and x86_64 archs. Anyway the old way to init
structs is not sane.
2014-11-27 01:55:47 +05:00
Ivan Romanov
20686e955c fixed compilation on android 2014-11-27 01:55:47 +05:00
Ivan Romanov
5d311c9219 cmake: build for android
Android uses .so as shared library suffix without version
2014-11-27 01:55:46 +05:00
Ivan Romanov
66447d0454 cmake: apply QCA_SUFFIX for cmake config module names 2014-11-22 06:30:07 +05:00
Ivan Romanov
2c58be171e cmake: warn user when QCA_SUFFIX is not set
Many linux distribution provides both version of Qt: Qt4 and Qt5.
These versions are binary is incompatible and any qt-based library
compiled against such Qt versions will be binary incompatible with
one another. In common case library name must not be related with
based libraries. In our case Linux users want to have both versions
QCA installed in their system. I will do not implicity rename Qt5
based QCA but just warn user and allow him explicity set QCA_SUFFIX.
2014-11-22 06:10:16 +05:00
Ivan Romanov
25860ff244 increased minimum cmake version
INCLUDE DESTINATION in install command was introduced only in CMake 2.8.12
2014-11-14 14:32:16 +05:00
Heiko Becker
593de6855a Fix build with libressl
libressl removed the SSL Compression functionality (which might
be considered insecure) and thus also compress_meth.
SSL_SESSION_get_compress_id is just a stub in libressl which always
returns 0 and in openssl it returns compress_meth.

REVIEW: 121107
2014-11-13 14:23:54 +05:00
Ivan Romanov
f8fe237c3c cmake: dropped dead variable 2014-11-13 02:13:50 +05:00
Ivan Romanov
72457bee3a qca-ossl: fixed compilation warnings 2014-11-13 02:13:50 +05:00
Ivan Romanov
8ffb52b439 cmake: pkg-config is not REQUIRED 2014-11-13 02:13:50 +05:00
Ivan Romanov
ca1667c118 dropped unused #include 2014-11-13 02:13:50 +05:00
Ivan Romanov
ef1b4b8eb0 Added myself to README v2.1.0 2014-11-06 13:15:45 +05:00
Ivan Romanov
f1b2a891c3 Updated changelog 2014-11-06 12:58:21 +05:00
Ivan Romanov
ba970ea670 added new note to TODO 2014-11-06 12:21:36 +05:00
Ivan Romanov
58e9539513 qca-ossl: added missed signatures 2014-11-06 12:16:27 +05:00
Ivan Romanov
f214d9c2a6 added frameworks support to crypto.prf 2014-11-05 22:42:32 +05:00
Ivan Romanov
0311beb5e5 cmake: do not use trailing slash for normalized paths 2014-11-05 22:42:32 +05:00
Ivan Romanov
13050bf00d cmake: plugins on Mac OS must use .dylib suffix 2014-11-05 22:42:32 +05:00
Ivan Romanov
de67ebfc8d cmake: USE_RELATIVE_PATHS now is option 2014-11-05 22:42:32 +05:00
Ivan Romanov
5de8ea800d cmake: added new option OSX_FRAMEWORK 2014-11-05 22:42:28 +05:00
Ivan Romanov
2445411897 cmake: added to previous commit 2014-11-05 22:34:22 +05:00
Ivan Romanov
35c678bee2 Revert "cmake: fixed path to qt mkspecs dir"
This reverts commit 2df13c85e866c7fc289cac867279bfc155a6307a.

It was wrong commit. Read http://qt-project.org/doc/qt-5/qmake-advanced-usage.html#adding-new-configuration-features
for detailes.
2014-11-05 22:29:35 +05:00
Ivan Romanov
d045cd7324 TODO: added plan for 2.2.0 version 2014-11-05 12:24:28 +05:00
Ivan Romanov
4694e4f1d7 dsaunittest: check for DSA_1024 is supported 2014-11-05 12:12:47 +05:00
Ivan Romanov
8ca9ddb56b keygenunittest: check that DLGroup supports DSA_* algorythmes 2014-11-05 12:06:58 +05:00