Merge branch 'master'

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

1 files changed, 225 insertions, 0 deletions

diff --git a/python/.gdb_history b/python/.gdb_history
new file mode 100644
index 0000000..747b80f
--- /dev/null
+++ b/python/.gdb_history
@@ -0,0 +1,225 @@
+b _olm_enc_input
+r
+l
+p key
+p key_lenght
+p key_length
+b _olm_enc_input
+r
+key[12]
+p key[12]
+p key[11]
+key[11]='\0'
+p key[11]='\0'
+p key[11]
+key_length=12
+p key_length=12
+n
+c
+b _olm_enc_input
+r
+r
+r
+b olm_decrypt
+r
+l
+b 677
+c
+s
+fin
+s
+s
+fin
+s
+s
+fin
+s
+l
+n
+l
+l
+s
+s
+n
+l
+n
+l
+p reader
+p *this
+n
+p chain
+p receiver_chains 
+p receiver_chains.length()
+p receiver_chains.size()
+p reader
+p reader.ratchet_key
+r
+r
+b olm_account_one_time_keys
+r
+l
+s
+n
+p *this
+p one_time_keys
+p one_time_keys.length
+p one_time_keys.length()
+p one_time_keys.len()
+p one_time_keys.size()
+p one_time_keys.count()
+p one_time_keys.data
+p one_time_keys._data
+p &one_time_keys._data
+l
+n
+q
+r
+b olm_create_inbound_session
+r
+b olm_create_inbound_session_from
+r
+r
+r
+b olm_create_inbound_session_from
+r
+b olm_create_inbound_session
+b olm_create_inbound_session
+r
+l
+n
+l
+s
+b olm_create_inbound_session
+r
+l
+l
+n
+s
+f
+s
+fin
+s
+s
+fin
+s
+l
+n
+l
+l -
+l
+l
+l
+n
+p our_one_time_key 
+p *our_one_time_key 
+l
+n
+l
+n
+p bob_one_time_key 
+p alice_identity_key 
+p alice_base_key 
+p bob_identity_key 
+x alice_identity_key 
+x &alice_identity_key 
+x /32x &alice_identity_key 
+x /32b &alice_identity_key 
+l
+l
+l
+n
+b olm_decrypt
+c
+l
+l
+b 'olm::Session::decrypt'
+c
+l
+l
+n
+l
+n
+p reader
+p reader
+5*128
+p 5*128
+p 0xb0 - 0x80
+p 0xb0 - 0x80 + 640
+l
+n
+s
+l
+n
+p reader
+n
+l
+n
+p max_length 
+p reader.ciphertext_length 
+l
+n
+l
+p receiver_chains 
+p &receiver_chains ._data
+p &receiver_chains ._data[1]
+n
+s
+s
+l
+n
+p new_chain.index
+p reader.counter
+n
+l
+l
+n
+s
+s
+n
+l
+x key
+x /16b key
+l
+l
+n
+p keys
+_olm_crypto_aes_decrypt_cbc&keys.aes_key, &keys.aes_iv, ciphertext, ciphertext_length, plaintext
+p _olm_crypto_aes_decrypt_cbc(&keys.aes_key, &keys.aes_iv, ciphertext, ciphertext_length, plaintext)
+p plaintext
+r
+b olm_account_identity_keys
+l
+r
+b olm_unpickle_account
+r
+l
+n
+p object.last_error
+l
+l -
+l
+b 268
+r
+c
+s
+l
+l
+p end-pos
+x /246b pos
+x /246x pos
+x /82x pos+164
+x /82x pos+132
+pos
+p pos
+x /246x pos
+r
+r
+b olm_create_outbound_session
+r
+n
+l
+p id_key_length
+p ot_key_length
+p olm::decode_base64_length(id_key_length)
+p olm::decode_base64_length(ot_key_length)
+p CURVE25519_KEY_LENGTH