Updates for full omemo:2 compliance

dino · Nov 14, 2022 · 0efc07f · 0efc07f
1 parent 32e43fa
commit 0efc07f
Show file tree

Hide file tree

Showing 43 changed files with 604 additions and 4,537 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ if(POLICY CMP0042)
 endif()
 
 SET(OMEMO_C_VERSION_MAJOR 0)
-SET(OMEMO_C_VERSION_MINOR 4)
+SET(OMEMO_C_VERSION_MINOR 5)
 SET(OMEMO_C_VERSION_PATCH 0)
 SET(OMEMO_C_VERSION ${OMEMO_C_VERSION_MAJOR}.${OMEMO_C_VERSION_MINOR}.${OMEMO_C_VERSION_PATCH})
 

diff --git a/README.md b/README.md
@@ -11,6 +11,10 @@ versions 0.3.0 and later.
   - HKDF info strings
   - Protocol buffer encoding
   - Signature scheme (uses XEd25519 instead of custom "Curve25519 signatures")
+  - Specification-compliant double ratchet
+  - Support for Ed25519 public keys
+  - Various serializations
+  - Removes unused functionality
 
 # Building libomemo-c
 
@@ -221,7 +225,7 @@ The form and manner of this distribution makes it eligible for export under the
 ## License
 ```
 Copyright 2015-2016 Open Whisper Systems
-Copyright 2020 Dino Team
+Copyright 2020-2022 Dino Team
 
 Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html
 

diff --git a/protobuf/FingerprintProtocol.proto b/protobuf/FingerprintProtocol.proto
diff --git a/protobuf/LocalStorageProtocol.proto b/protobuf/LocalStorageProtocol.proto
@@ -59,6 +59,8 @@ message SessionStructure {
 
     optional bool needsRefresh = 12;
     optional bytes aliceBaseKey = 13;
+
+    optional bool localIsAlice = 14;
 }
 
 message RecordStructure {
@@ -78,6 +80,7 @@ message SignedPreKeyRecordStructure {
     optional bytes   privateKey = 3;
     optional bytes   signature  = 4;
     optional fixed64 timestamp  = 5;
+    optional bytes   signature_omemo = 6;
 }
 
 message IdentityKeyPairStructure {
@@ -109,4 +112,4 @@ message SenderKeyStateStructure {
 
 message SenderKeyRecordStructure {
     repeated SenderKeyStateStructure senderKeyStates = 1;
-}
+}
diff --git a/protobuf/Makefile b/protobuf/Makefile
@@ -1,3 +1,3 @@
 
 all:
-	protoc-c --c_out=../src/ WhisperTextProtocol.proto LocalStorageProtocol.proto FingerprintProtocol.proto OMEMO.proto
+	protoc-c --c_out=../src/ WhisperTextProtocol.proto LocalStorageProtocol.proto OMEMO.proto
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -14,7 +14,6 @@ include_directories(
 set(protobuf_SRCS
 	LocalStorageProtocol.pb-c.c
 	WhisperTextProtocol.pb-c.c
-	FingerprintProtocol.pb-c.c
 	OMEMO.pb-c.c
 )
 
@@ -52,14 +51,6 @@ set(omemo_SRCS
 	sender_key_state.h
 	sender_key_record.c
 	sender_key_record.h
-	group_session_builder.c
-	group_session_builder.h
-	group_cipher.c
-	group_cipher.h
-	fingerprint.c
-	fingerprint.h
-	device_consistency.c
-	device_consistency.h
 )
 
 add_subdirectory(curve25519)
@@ -99,10 +90,6 @@ INSTALL(
 	sender_key.h
 	sender_key_state.h
 	sender_key_record.h
-	group_session_builder.h
-	group_cipher.h
-	fingerprint.h
-	device_consistency.h
 	DESTINATION ${INCLUDE_INSTALL_DIR}/omemo
 )
 

diff --git a/src/FingerprintProtocol.pb-c.c b/src/FingerprintProtocol.pb-c.c