diff --git a/boot.php b/boot.php index 821e74672b..0992f6b538 100644 --- a/boot.php +++ b/boot.php @@ -7,7 +7,7 @@ require_once('include/text.php'); require_once("include/pgettext.php"); -define ( 'FRIENDIKA_VERSION', '2.2.1076' ); +define ( 'FRIENDIKA_VERSION', '2.2.1077' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1081 ); diff --git a/include/crypto.php b/include/crypto.php index 1ab9e7b25f..6b27e832bd 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -182,3 +182,5 @@ function salmon_key($pubkey) { pemtome($pubkey,$m,$e); return 'RSA' . '.' . base64url_encode($m,true) . '.' . base64url_encode($e,true) ; } + + diff --git a/include/diaspora.php b/include/diaspora.php index b14c38f1d3..2e8ff6892c 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -30,12 +30,12 @@ function diaspora_msg_build($msg,$user,$contact,$prvkey,$pubkey) { $inner_aes_key = random_string(32); $b_inner_aes_key = base64_encode($inner_aes_key); - $inner_iv = random_string(32); + $inner_iv = random_string(16); $b_inner_iv = base64_encode($inner_iv); $outer_aes_key = random_string(32); $b_outer_aes_key = base64_encode($outer_aes_key); - $outer_iv = random_string(32); + $outer_iv = random_string(16); $b_outer_iv = base64_encode($outer_iv); $handle = 'acct:' . $user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);