Don't think this matters since there's no PkEncryption /
PkDecryption object being passed, but for the sake of consistency

Fix output buffer length check

...when generating a key in PkDecryption.

The pubkey is base64ed on the output, so will be longer.

gradle 2.14.1 to 4.7
build tools 21.1.2 to 27.0.3
build gradle 2.1.3 to 3.1.3

Patch received in https://github.com/matrix-org/olm/issues/13

Patch has been received by e-mail, Signed-off-by: Arnaud Fontaine <arnaud.fontaine@ssi.gouv.fr>

Signed-off-by: Wilfried Klaebe <w+gitstuff@chaos.in-kiel.de>

The code for this change is taken from
https://stackoverflow.com/a/30225575/4929236



This patch is Signed-Off-By: Marcel Radzio <marcel@radzio-sh.de>

From 4a82d31e8cb808a04956fc847ed0ec0ff322b956 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Wed, 3 Jan 2018 21:37:43 -0500
Subject: [PATCH] fix some typos in JavaScript library

Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>

because we may not have pep8 installed at the system level

Signed-off-by: Alexey Rusakov <ktirf@users.sf.net>

This disrupts building at least with Visual Studio.

Signed-off-by: Alexey Rusakov <ktirf@users.sf.net>

Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>

It's not much use if everything is hardcoded.

Merge master into patched branch to fix conflicts prior to merge back to master

Fix line lengths in newly-added code