Commit Graph

7332 Commits

Author SHA1 Message Date
Mikkel Krautz
8eb9dfdce9 scripts/mklic.pl, 3rdPartyLicenses: add libdaemon license. 2018-02-11 11:54:17 +01:00
Mikkel Krautz
185a0aa9f3 scripts/mklic.pl, 3rdPartyLicenses: add libcap2 license. 2018-02-11 11:54:15 +01:00
Mikkel Krautz
33a1a05b3e scripts/mklic.pl, 3rdPartyLicenses: add glib license. 2018-02-11 11:54:13 +01:00
Mikkel Krautz
c93692ca44 scripts/mklic.pl, 3rdPartyLicenses: add libfuse license. 2018-02-11 11:53:56 +01:00
Mikkel Krautz
4a83bb8aea scripts/mklic.pl, 3rdPartyLicenses: add squashfuse license. 2018-02-11 11:53:15 +01:00
Mikkel Krautz
c310c42de3 scripts/mklic.pl, 3rdPartyLicenses: add AppImage runtime license. 2018-02-11 11:50:46 +01:00
Mikkel Krautz
8407b49ea9 scripts/mklic.pl, 3rdPartyLicenses: add D-Bus license. 2018-02-11 11:50:44 +01:00
Mikkel Krautz
eae5e74bcc scripts/mklic.pl, 3rdPartyLicenses: add Avahi license. 2018-02-11 11:50:42 +01:00
Mikkel Krautz
2a2a0e04ae scripts/mklic.pl, 3rdPartyLicenses: add XAR license. 2018-02-11 11:50:40 +01:00
Mikkel Krautz
ec789c6c28 scripts/mklic.pl, 3rdPartyLicenses: add SQLite3 license. 2018-02-11 11:50:37 +01:00
Mikkel Krautz
0eb596a347 scripts/mklic.pl, 3rdPartyLicenses: add Qt license. 2018-02-11 11:50:35 +01:00
Mikkel Krautz
ced5a500a9 scripts/mklic.pl, 3rdPartyLicenses: add PCRE license. 2018-02-11 11:50:33 +01:00
Mikkel Krautz
9b1f221549 scripts/mklic.pl, 3rdPartyLicenses: add mDNSResponder license. 2018-02-11 11:50:31 +01:00
Mikkel Krautz
1d0e70091d scripts/mklic.pl, 3rdPartyLicenses: add mcpp license. 2018-02-11 11:50:29 +01:00
Mikkel Krautz
4f846c3b7e scripts/mklic.pl, 3rdPartyLicenses: add ZeroC Ice license. 2018-02-11 11:50:27 +01:00
Mikkel Krautz
ab20c90aa2 scripts/mklic.pl, 3rdPartyLicenses: add libjpeg-turbo license. 2018-02-11 11:50:25 +01:00
Mikkel Krautz
ae213d7619 scripts/mklic.pl, 3rdPartyLicenses: add libpng license. 2018-02-11 11:50:23 +01:00
Mikkel Krautz
51907d0f6e scripts/mklic.pl, 3rdPartyLicenses: add harfbuzz-ng license. 2018-02-11 11:50:16 +01:00
Mikkel Krautz
bbc0cb5cc9 scripts/mklic.pl, 3rdPartyLicenses: add freetype license. 2018-02-11 11:49:41 +01:00
Mikkel Krautz
f47335c135 scripts/mklic.pl, 3rdPartyLicenses: add BerkeleyDB license. 2018-02-11 11:49:00 +01:00
Mikkel Krautz
b07551de1e scripts/mklic.pl, 3rdPartyLicenses: add bzip2 license. 2018-02-11 11:22:52 +01:00
Mikkel Krautz
96cd9b9d04 scripts/mklic.pl, 3rdPartyLicenses: add Boost license. 2018-02-11 10:57:03 +01:00
Mikkel Krautz
a19b3887cb scripts/mklic.pl, 3rdPartyLicenses: add expat license. 2018-02-11 10:50:22 +01:00
Mikkel Krautz
44b1248b8e scripts/mklic.pl, 3rdPartyLicenses: add protobuf license. 2018-02-11 10:50:22 +01:00
Mikkel Krautz
717cefc7ba scripts/mklic.pl, 3rdPartyLicenses: add zlib license. 2018-02-11 10:50:22 +01:00
Mikkel Krautz
84e0f7d993 scripts/mklic.pl: add MariaDB Connector/C license.
This is shipped with all our official binary copies of Murmur
(except on macOS at the moment, but that's a historic accident...)
2018-02-11 10:50:22 +01:00
Mikkel Krautz
6fc31cb456 scripts/mklic.pl: Use MinHook license from 3rdparty/minhook-src.
Drop our own copy of the license, and use the one from the submodule.
That way, it's always up-to-date.
2018-02-11 10:50:22 +01:00
Mikkel Krautz
ada91f18d1 3rdPartyLicenses: update OpenSSL license.
Also, make sure we also include the SSLeay license text.
2018-02-11 10:50:22 +01:00
Mikkel Krautz
0dddc4378f
Merge PR #3337: XMLTools: remove unused default argument 'opstyle' in recurseParse(). 2018-02-11 00:40:56 +01:00
Mikkel Krautz
7f52257417 XMLTools: remove default argument 'opstyle' in recurseParse().
This fixes the build on our OS X Universal builder.
Our legacy OS X Universal builder's gcc 4.2 seems to
misparse this.

The only place the default argument is used is in test
code, which is easily changable. Also, this is internal
API, so we can change it as we wish.

Fixes mumble-voip/mumble#3336
2018-02-11 00:03:58 +01:00
Mikkel Krautz
39c526a74f
Merge PR #3335: Update mumble.desktop 2018-02-10 17:11:15 +01:00
ronnystandtke
dfef2eb6d1
Update mumble.desktop
- removed redundant translations of the Name field
- added German translations for the GenericName and Comment fields
2018-02-10 17:07:00 +01:00
Tim Cooper
765f780747
Merge pull request #3332 from bontibon/issue-3299
ignore connecting users in qhUsers hash in gRPC implementation
2018-02-08 18:11:27 -04:00
Tim Cooper
23b171c126 ignore connecting users in qhUsers hash in gRPC implementation
Fixes #3299
2018-02-08 17:45:25 -04:00
Mikkel Krautz
aa90739bfd
Merge PR #3326: Fix error when handling TCP tunneled UDP voice packets 2018-01-29 21:01:07 +01:00
Jan Klass
c8ed9f9a00 Fix error when handling TCP tunneled UDP voice packets
0b5579c755 erroneously replaced the
variable (letter) l with the integer 1.

Revert this change and use a more descriptive variable name `len`.

Fixes #3325
2018-01-29 19:10:34 +01:00
Mikkel Krautz
16810dd562
Merge PR #3322: SelfSignedCertificate: fix automatic certificate generator
Previously, the generator was choosing the certificate type (server or client) basing on the presence of the name and email, which broke it.

This PR also includes various other small fixes.

Fixes mumble-voip/mumble#3284.
2018-01-27 22:45:57 +01:00
Mikkel Krautz
b28c30a07e TestSelfSignedCertificate: add tests that exercise new email SAN behavior.
This commit adds tests to ensure that it's now possible to create a
client certificate without an email, and that creating a client certificate
with an email still works.

This is added because SelfSignedCertificate now conditionally adds an email
subject alt name (SAN) to the generated certificate. If the passed-in email
is empty, SelfSignedCertificat will not include the SAN.
2018-01-27 13:12:07 +01:00
Mikkel Krautz
519d04bb3a SelfSignedCertificate: only add email SAN to client certs if the passed-in email is non-empty.
This commit ensures that we only add the email subject alt name (SAN) if the passed-in
email is non-empty.

It turns out that the call to X509V3_EXT_conf_nid() in add_ext() will fail
if the SAN value is formatted incorrectly. In our case, we passed "email:"
as the value, and X509V3_EXT_conf_nid() would return NULL.

To fix this, we now check whether the email we've been given is empty or not.
If it's empty, we don't add the SAN. If it's there, we do.
2018-01-27 13:05:47 +01:00
Mikkel Krautz
7dd6ec6d26 SelfSignedCertificate: add missing 'goto out's.
In these two places, we forgot to call invoke 'goto out'
to return early, after setting ok to false.
2018-01-27 13:04:08 +01:00
davidebeatrici
92011a9dd2 TestSelfSignedCertificate: Change empty name and email test to work with SelfSignedCertificate's new logic
Now it shouldn't fail, since we don't rely on the name and email to detect the certificate type anymore.
2018-01-25 01:16:31 +01:00
davidebeatrici
e017c4063f TestSelfSignedCertificate: Check that both "cert" and "key" are not empty
It was a copy/paste error.
2018-01-25 01:10:14 +01:00
davidebeatrici
d47f2e342c SelfSignedCertificate: Fix automatic certificate generator, by specifying the certificate type with an enum
Previously, the generator was choosing the certificate type (server or client) basing on the presence of the name and email, which is not ideal.

Fixes #3284.
2018-01-25 00:55:31 +01:00
Mikkel Krautz
1273ba90b6
Merge PR #3318: Fix changes made in #3311 2018-01-25 00:47:59 +01:00
davidebeatrici
6d8dcdc881 PulseAudio.cpp: Revert changes applied by commit 0b5579c and comment intentional fallthroughs 2018-01-23 01:12:25 +01:00
davidebeatrici
f2d0a2f16e Server.cpp: Remove line of code accidentally added in commit 0b5579c 2018-01-23 01:07:52 +01:00
Davide Beatrici
1b203cdc8b
Merge PR #3311: Fix and refactor problems found via GCC 7's -Wimplicit-fallthrough. 2018-01-22 00:55:12 +01:00
davidebeatrici
0b5579c755 Fix and refactor problems found via GCC 7's -Wimplicit-fallthrough.
This commit fixes various problems discovered by building on Debian buster
which uses GCC 7. Building on buster gave various -Wimplicit-fallthrough warnings.

In Group.cpp and Server.cpp, we now use if statements instead of a switch with fallthrough.
This improves readability of the code, and fixes the implicit fallthroughs.

In PulseAudio.cpp, we had unintended fallthroughs in a switch statement, which have been
fixed.

In Cert.cpp, we had a potential fallthrough which was impossible to trigger at runtime,
fixed by adding an error return, like the surrounding code.

Fixes #3306.
2018-01-21 22:54:47 +01:00
Mikkel Krautz
e5ff9c5225
Merge PR #3310: Correctly handle ServerResolver errors, with dedicated signal and slot 2018-01-21 17:09:53 +01:00
davidebeatrici
6bd9bc9c9d Correctly handle ServerResolver errors, with dedicated signal and slot
This commit adds a signal to ServerResolver and a slot to MainWindow to handle ServerHandler errors, in order to start the reconnection timer after the first connection attempt.

Fixes #3220.
2018-01-21 14:29:31 +01:00