1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-05 19:42:04 +02:00
Commit graph

120 commits

Author SHA1 Message Date
Stefan Strogin
38e8ceea1a Add LibreSSL <2.7.0 support
Fixes #419
2018-11-07 01:25:00 +02:00
B. Petersen
0a314dfa4d disable debug test that takes half of the signing time (~800ms on android), tackles #376 2018-10-10 23:16:44 +02:00
Floris Bruynooghe
9376407564 Fix usage of netpgp fallback libs
We can not use cc.has_header() when using a fallback, but we know
the fallback so can just set things correctly for it.

fixes #350
2018-10-09 16:38:25 -07:00
Lars-Magnus Skog
9c7d1bb112
Neppgp ssl mac (#347)
* Do not set HAVE_*_H defines for disabled features

It seems the mac build fails if we set the defines like this so
let's try avoiding including the header file alltogether.  I didn't
expect ssl to look at that define but there you go.

Maybe fixes #337

* Try to silence a few more warnings

Spotted on mac:
435493605

* Do not set HAVE_*_H defines for disabled features

It seems the mac build fails if we set the defines like this so
let's try avoiding including the header file alltogether.  I didn't
expect ssl to look at that define but there you go.

Maybe fixes #337

* Try to silence a few more warnings

Spotted on mac:
435493605

* booleans, how do they work
2018-10-06 17:41:54 +02:00
Floris Bruynooghe
9f986025d5 Fix typo
Fixes #335
2018-09-30 16:11:28 -07:00
B. Petersen
d7ab3446d7 check for some NULL-pointers, tackles #333 2018-09-29 14:27:40 +02:00
Floris Bruynooghe
e897b4e771 Restore the includes to use their orignal paths
Further undoing some changes I did.
2018-09-26 14:00:43 -05:00
Floris Bruynooghe
cf756214cf Do not break current android build
The config-netpgp.h file in this repo is directly used by
delta-android, so we should not delete it.  Instead we add a way
for the meson build to use it's own config.h file.
2018-09-26 13:55:07 -05:00
Floris Bruynooghe
951d8f584f Use features for openssl-camellia and openssl-idea
These actually switch on and off code, as opposed to the other HAVE
detction macros which only switch off header includes (and maybe
things would break if they're not there, but that's an existing bug
in netpgp).  So we want to be sure that they are present when we
need them.  This is what features are for.

This configures these features in delta-core as well.
2018-09-26 12:34:53 -05:00
Floris Bruynooghe
a88e33d013 Corect HAVE_ ifdef for openssl/cast.h 2018-09-26 12:34:08 -05:00
Floris Bruynooghe
1621ec4791 Apparently delta-core does use camellia
Also swithc to the static-pic-lib scheme.  The build_target() call
still does not work transparently for --default_library=both in case
of not a subproject, so there's not much to gain from it.  Basically
meson does not support building monolith libraries very easily (no
one does afaik).
2018-09-25 17:41:16 -05:00
Floris Bruynooghe
0ccd2cfaa4 How does merging even work 2018-09-25 16:59:48 -05:00
Floris Bruynooghe
8d57171424 Merge branch 'master' into bzip 2018-09-25 16:58:17 -05:00
Floris Bruynooghe
e1a98e1f29 Correctly propagate dependencies
This doesn't really matter since all these dependencies are already
dependencies of deltachat directly, but that's not necessarily the
case.
2018-09-25 16:53:24 -05:00
Floris Bruynooghe
04dffc5a77 Update netpgp build scripts
These now do all the dection rather than hardcoding things.  It
also removes the dependency of bzip2 for the delta-core build,
bzip2 is now a feature and delta-core disables it.
2018-09-25 16:43:10 -05:00
Angelo Fuchs
390f486e6e remove requirement for bzip2 closes #301 2018-09-24 12:28:50 +02:00
Floris Bruynooghe
a251dcc42f Tweak buildscripts a little
- Require a minimum meson version, so we can tell people to use
  --wrap-mode=forcefallback

- Rename the option "fat" to "monolith"

- Error when trying to build a monolith static library, that's a lot
  of work since meson does not natively support this.

- Create a dependency for our main lib and use that in the
  commandline.  This fixes some duplication.
2018-09-18 23:33:34 +02:00
Lars-Magnus Skog
5eb4700a01 Resolve symlinks in libs/openssl/include/openssl to files 2018-09-18 12:07:19 +02:00
Floris Bruynooghe
05304fddcd Build all the bundled libraries when appropriate
This can now create a few things:

- Build a shared lib linked against system libs
- Build a static lib linked against system libs
- Build a shared "fat" lib using internal deps
- Build a static lib using interal deps

The readme needs updating.
2018-09-18 12:07:19 +02:00
B. Petersen
06f139a699 start a script that can update openssl 2018-08-31 16:50:33 +02:00
B. Petersen
04cb4dcd4e remove android-depending makefiles 2018-08-31 15:34:03 +02:00
B. Petersen
2823ef80c5 comment 2018-08-31 14:02:21 +02:00
B. Petersen
9a53dab692 typo 2018-08-24 11:26:55 +02:00
B. Petersen
b28a2ca875 update libetpan from upstream; this contains the changes provided by ralphtheninja and r10s 2018-08-24 11:25:50 +02:00
B. Petersen
b4f310c2be add cyrussasl, iconv, openssl to libs for optional usage (if system does not provide) 2018-08-17 16:06:47 +02:00
B. Petersen
a1979fa138 comment 2018-08-14 23:32:06 +02:00
B. Petersen
5d3f7ac28f call update-libetpan.sh to remove the symlinks 2018-08-14 15:42:00 +02:00
B. Petersen
e70475f34e avoid symlinks in libetpan and copy the headers as files (eg. 'npm publish' does not allow symlinks) 2018-08-14 15:37:18 +02:00
B. Petersen
9928e12c59 keep meson.build when updating libetpan 2018-08-14 12:43:12 +02:00
B. Petersen
1c7ed9af7e fix bug found by valgrind: init symmetric-decryption with correct blocksize 2018-07-12 19:41:14 +02:00
B. Petersen
9c841ad10b fix errors detected by valgrind, esp. in decrypting symmetric-data of the setup message 2018-07-12 18:55:25 +02:00
B. Petersen
d518259885 update libEtPan to 1.8.0-dev-20180704 2018-07-04 11:58:13 +02:00
Floris Bruynooghe
702b3ccc49 Use bundeled libetpan by default
Using the system-libetpan causes pain to people who have out-dated
library versions, additionally it is nice to by default create a
library which uses dependencies as close as possible to the android
version for testing purposes.  This makes sure that the bundeled
sub-projects are used by default.

Additionally it makes sure to not install these bundeled dependencies
and only statically link the libdeltachat.so against them.  This is
beneficial to not conflict with any system-installed versions of these
libraries, especially since some bundled libraries are stripped down
and would not provide indirect users of the library the full library
functionality.

It does still provide an option to use the system-provided libetpan if
desired however, this makes sure libdeltachat plays nice with normal
package managers etc.
2018-06-10 19:52:54 +02:00
Floris Bruynooghe
5f3c12f0bc Link against bundled libetpan
This should still be made optional.
2018-06-10 16:37:39 +02:00
B. Petersen
1e153e7ca3 do not read beyond allocated buffer 2018-05-28 20:28:44 +02:00
B. Petersen
e07df154d8 update libetpan from 1.8 to 1.8.0-dev-20180528 2018-05-28 20:28:01 +02:00
B. Petersen
94573580e2 update libetpan from 1.7 to 1.8 2018-05-28 17:29:09 +02:00
B. Petersen
a505e628c0 remove more unused code from libetpan 2018-05-28 17:15:42 +02:00
B. Petersen
0b91e72355 remove unused code from libetpan 2018-05-28 17:04:51 +02:00
B. Petersen
86cadf012e add update script for libetpan 2018-05-28 16:21:38 +02:00
B. Petersen
9affbc37e7 update sqlite from 3.22.0 to 3.23.1 2018-05-27 13:49:12 +02:00
B. Petersen
061a8bfac7 correct verify checkmarks 2018-04-14 16:59:15 +02:00
B. Petersen
8d3d9e4757 update sqlite from 3.19.3 to 3.22.0 2018-03-09 21:18:14 +01:00
B. Petersen
1696f53dd9 comment 2018-02-18 22:00:21 +01:00
B. Petersen
4cedcccc6d netpgp: handle unsupported encryption algorithms more graceful 2018-02-18 21:58:55 +01:00
B. Petersen
94fd79aecb support symm. decryption with 'Encrypted session key' present 2018-02-18 19:07:27 +01:00
B. Petersen
96145c6e8f prepare for decrypting 'Symmetric-Key Encrypted Session Key Packets' encrypted with the optional 'Encrypted Session Keys' 2018-02-18 14:11:13 +01:00
B. Petersen
6cb9c1be80 add basic symmetric decryption to netpgp 2018-02-17 17:35:29 +01:00
B. Petersen
e2986045de prepare netpgp to access a password for symmetric decryption 2018-02-17 00:32:27 +01:00
B. Petersen
3a13a540c3 comment, remove unused netpgp code 2018-02-16 21:42:56 +01:00