Merge branch 'Protocol_00' of git.gmoker.com:icing/monorepo into Protocol_00

Demo call page avec les features de base:
- Haut parleur
- Couper/activer micro
- keypad
- raccrocher
- Display Icing state (toucher pour switch l'état)

S'active en faisant un appui long sur le bouton d'appel depuis les détails du contact.
Compatible avec l'obfuscation des contacts.

Co-authored-by: AlexisDanlos <91090088+AlexisDanlos@users.noreply.github.com>
Reviewed-on: #37
Co-authored-by: alexis <alexis.danlos@epitech.eu>
Co-committed-by: alexis <alexis.danlos@epitech.eu>

dialer/android/app/src/main/AndroidManifest.xml

@@ -1,19 +1,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.icing.dialer">
     <uses-feature android:name="android.hardware.telephony" android:required="true" />
 
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-permission android:name="android.permission.READ_BLOCKED_NUMBERS" />
     <uses-permission android:name="android.permission.WRITE_BLOCKED_NUMBERS" />
-    <uses-permission android:name="android.permission.READ_CALL_LOG"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.READ_CALL_LOG" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
     <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS" />
     <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <application
         android:label="Icing Dialer"
@@ -29,17 +27,12 @@
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
-            <!-- Specifies an Android theme to apply to this Activity as soon as
-                 the Android process has started. This theme is visible to the user
-                 while the Flutter UI initializes. After that, this theme continues
-                 to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme" />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <!-- Dialer intent filters (required for default dialer eligibility) -->
             <intent-filter>
@@ -89,15 +82,10 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
-    <!-- Required to query activities that can process text, see:
-         https://developer.android.com/training/package-visibility and
-         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
-
-         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
     <queries>
         <intent>
-            <action android:name="android.intent.action.PROCESS_TEXT"/>
-            <data android:mimeType="text/plain"/>
+            <action android:name="android.intent.action.PROCESS_TEXT" />
+            <data android:mimeType="text/plain" />
         </intent>
     </queries>
 </manifest>

dialer/android/app/src/main/kotlin/com/icing/dialer/activities/MainActivity.kt

@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.database.Cursor
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.CallLog
@@ -25,76 +26,23 @@ class MainActivity : FlutterActivity() {
     private val CALL_CHANNEL = "call_service"
     private val TAG = "MainActivity"
     private val REQUEST_CODE_SET_DEFAULT_DIALER = 1001
-    private val REQUEST_CODE_CALL_LOG_PERMISSION = 1002
-    private var pendingIncomingCall: Pair<String?, Boolean>? = null
-    private var wasPhoneLocked: Boolean = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         Log.d(TAG, "onCreate started")
-        wasPhoneLocked = intent.getBooleanExtra("wasPhoneLocked", false)
-        Log.d(TAG, "Was phone locked at start: $wasPhoneLocked")
-        updateLockScreenFlags(intent)
-        handleIncomingCallIntent(intent)
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        setIntent(intent)
-        wasPhoneLocked = intent.getBooleanExtra("wasPhoneLocked", false)
-        Log.d(TAG, "onNewIntent, wasPhoneLocked: $wasPhoneLocked")
-        updateLockScreenFlags(intent)
-        handleIncomingCallIntent(intent)
-    }
-
-    private fun updateLockScreenFlags(intent: Intent?) {
-        val isIncomingCall = intent?.getBooleanExtra("isIncomingCall", false) ?: false
-        if (isIncomingCall && wasPhoneLocked) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-                setShowWhenLocked(true)
-                setTurnScreenOn(true)
-            } else {
-                @Suppress("DEPRECATION")
-                window.addFlags(
-                    android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
-                    android.view.WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
-                )
-            }
-            Log.d(TAG, "Enabled showWhenLocked and turnScreenOn for incoming call")
-        } else {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-                setShowWhenLocked(false)
-                setTurnScreenOn(false)
-            } else {
-                @Suppress("DEPRECATION")
-                window.clearFlags(
-                    android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
-                    android.view.WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
-                )
-            }
-            Log.d(TAG, "Disabled showWhenLocked and turnScreenOn for normal usage")
-        }
+        Log.d(TAG, "Waiting for Flutter to signal permissions")
     }
 
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
         Log.d(TAG, "Configuring Flutter engine")
-        MyInCallService.channel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CALL_CHANNEL)
 
+        MyInCallService.channel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CALL_CHANNEL)
         MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CALL_CHANNEL)
             .setMethodCallHandler { call, result ->
                 when (call.method) {
                     "permissionsGranted" -> {
                         Log.d(TAG, "Received permissionsGranted from Flutter")
-                        pendingIncomingCall?.let { (phoneNumber, showScreen) ->
-                            if (showScreen) {
-                                MyInCallService.channel?.invokeMethod("incomingCallFromNotification", mapOf(
-                                    "phoneNumber" to phoneNumber,
-                                    "wasPhoneLocked" to wasPhoneLocked
-                                ))
-                                pendingIncomingCall = null
-                            }
-                        }
                         checkAndRequestDefaultDialer()
                         result.success(true)
                     }
@@ -112,66 +60,37 @@ class MainActivity : FlutterActivity() {
                         }
                     }
                     "hangUpCall" -> {
-                        val success = MyInCallService.currentCall?.let {
-                            it.disconnect()
-                            Log.d(TAG, "Call disconnected")
-                            MyInCallService.channel?.invokeMethod("callEnded", mapOf(
-                                "callId" to it.details.handle.toString(),
-                                "wasPhoneLocked" to wasPhoneLocked
-                            ))
-                            true
-                        } ?: false
+                        val success = CallService.hangUpCall(this)
                         if (success) {
                             result.success(mapOf("status" to "ended"))
-                            if (wasPhoneLocked) {
-                                Log.d(TAG, "Finishing and removing task after hangup, phone was locked")
-                                finishAndRemoveTask()
-                            }
                         } else {
-                            Log.w(TAG, "No active call to hang up")
-                            result.error("HANGUP_FAILED", "No active call to hang up", null)
+                            result.error("HANGUP_FAILED", "Failed to end call", null)
                         }
                     }
                     "answerCall" -> {
                         val success = MyInCallService.currentCall?.let {
-                            it.answer(0)
+                            it.answer(0) // 0 for default video state (audio-only)
                             Log.d(TAG, "Answered call")
                             true
                         } ?: false
                         if (success) {
                             result.success(mapOf("status" to "answered"))
                         } else {
-                            Log.w(TAG, "No active call to answer")
                             result.error("ANSWER_FAILED", "No active call to answer", null)
                         }
                     }
-                    "callEndedFromFlutter" -> {
-                        Log.d(TAG, "Call ended from Flutter, wasPhoneLocked: $wasPhoneLocked")
-                        if (wasPhoneLocked) {
-                            finishAndRemoveTask()
-                            Log.d(TAG, "Finishing and removing task after call ended, phone was locked")
-                        }
-                        result.success(true)
-                    }
                     else -> result.notImplemented()
                 }
             }
 
         MethodChannel(flutterEngine.dartExecutor.binaryMessenger, KEYSTORE_CHANNEL)
-            .setMethodCallHandler { call, result ->
-                KeystoreHelper(call, result).handleMethodCall()
-            }
+            .setMethodCallHandler { call, result -> KeystoreHelper(call, result).handleMethodCall() }
 
         MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CALLLOG_CHANNEL)
             .setMethodCallHandler { call, result ->
                 if (call.method == "getCallLogs") {
-                    if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_CALL_LOG) == PackageManager.PERMISSION_GRANTED) {
-                        val callLogs = getCallLogs()
-                        result.success(callLogs)
-                    } else {
-                        requestPermissions(arrayOf(Manifest.permission.READ_CALL_LOG), REQUEST_CODE_CALL_LOG_PERMISSION)
-                        result.error("PERMISSION_DENIED", "Call log permission not granted", null)
-                    }
+                    val callLogs = getCallLogs()
+                    result.success(callLogs)
                 } else {
                     result.notImplemented()
                 }
@@ -190,6 +109,8 @@ class MainActivity : FlutterActivity() {
                     val intent = roleManager.createRequestRoleIntent(RoleManager.ROLE_DIALER)
                     startActivityForResult(intent, REQUEST_CODE_SET_DEFAULT_DIALER)
                     Log.d(TAG, "Launched RoleManager intent for default dialer on API 29+")
+                } else {
+                    Log.d(TAG, "RoleManager: Available=${roleManager.isRoleAvailable(RoleManager.ROLE_DIALER)}, Held=${roleManager.isRoleHeld(RoleManager.ROLE_DIALER)}")
                 }
             } else {
                 val intent = Intent(TelecomManager.ACTION_CHANGE_DEFAULT_DIALER)
@@ -227,18 +148,6 @@ class MainActivity : FlutterActivity() {
         }
     }
 
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        if (requestCode == REQUEST_CODE_CALL_LOG_PERMISSION) {
-            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                Log.d(TAG, "Call log permission granted")
-                MyInCallService.channel?.invokeMethod("callLogPermissionGranted", null)
-            } else {
-                Log.w(TAG, "Call log permission denied")
-            }
-        }
-    }
-
     private fun getCallLogs(): List<Map<String, Any?>> {
         val logsList = mutableListOf<Map<String, Any?>>()
         val cursor: Cursor? = contentResolver.query(
@@ -262,25 +171,4 @@ class MainActivity : FlutterActivity() {
         }
         return logsList
     }
-
-    private fun handleIncomingCallIntent(intent: Intent?) {
-        intent?.let {
-            if (it.getBooleanExtra("isIncomingCall", false)) {
-                val phoneNumber = it.getStringExtra("phoneNumber")
-                val showScreen = it.getBooleanExtra("showIncomingCallScreen", false)
-                Log.d(TAG, "Received incoming call intent for $phoneNumber, showScreen=$showScreen, wasPhoneLocked=$wasPhoneLocked")
-                if (showScreen) {
-                    if (MyInCallService.channel != null) {
-                        MyInCallService.channel?.invokeMethod("incomingCallFromNotification", mapOf(
-                            "phoneNumber" to phoneNumber,
-                            "wasPhoneLocked" to wasPhoneLocked
-                        ))
-                    } else {
-                        pendingIncomingCall = Pair(phoneNumber, true)
-                        Log.d(TAG, "Flutter channel not ready, storing pending call: $phoneNumber")
-                    }
-                }
-            }
-        }
-    }
 }

dialer/android/app/src/main/kotlin/com/icing/dialer/services/MyInCallService.kt

@@ -1,17 +1,8 @@
 package com.icing.dialer.services
 
-import android.app.KeyguardManager
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.os.Build
 import android.telecom.Call
 import android.telecom.InCallService
 import android.util.Log
-import androidx.core.app.NotificationCompat
-import com.icing.dialer.activities.MainActivity
 import io.flutter.plugin.common.MethodChannel
 
 class MyInCallService : InCallService() {
@@ -19,9 +10,6 @@ class MyInCallService : InCallService() {
         var channel: MethodChannel? = null
         var currentCall: Call? = null
         private const val TAG = "MyInCallService"
-        private const val NOTIFICATION_CHANNEL_ID = "incoming_call_channel"
-        private const val NOTIFICATION_ID = 1
-        var wasPhoneLocked: Boolean = false
     }
 
     private val callCallback = object : Call.Callback() {
@@ -38,22 +26,12 @@ class MyInCallService : InCallService() {
             Log.d(TAG, "State changed: $stateStr for call ${call.details.handle}")
             channel?.invokeMethod("callStateChanged", mapOf(
                 "callId" to call.details.handle.toString(),
-                "state" to stateStr,
-                "wasPhoneLocked" to wasPhoneLocked
+                "state" to stateStr
             ))
-            if (state == Call.STATE_RINGING) {
-                val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
-                wasPhoneLocked = keyguardManager.isKeyguardLocked
-                Log.d(TAG, "Phone locked at ringing: $wasPhoneLocked")
-                showIncomingCallScreen(call.details.handle.toString().replace("tel:", ""))
-            } else if (state == Call.STATE_DISCONNECTED || state == Call.STATE_DISCONNECTING) {
-                Log.d(TAG, "Call ended: ${call.details.handle}, wasPhoneLocked: $wasPhoneLocked")
-                channel?.invokeMethod("callEnded", mapOf(
-                    "callId" to call.details.handle.toString(),
-                    "wasPhoneLocked" to wasPhoneLocked
-                ))
+            if (state == Call.STATE_DISCONNECTED || state == Call.STATE_DISCONNECTING) {
+                Log.d(TAG, "Call ended: ${call.details.handle}")
+                channel?.invokeMethod("callEnded", mapOf("callId" to call.details.handle.toString()))
                 currentCall = null
-                cancelNotification()
             }
         }
     }
@@ -65,32 +43,22 @@ class MyInCallService : InCallService() {
             Call.STATE_DIALING -> "dialing"
             Call.STATE_ACTIVE -> "active"
             Call.STATE_RINGING -> "ringing"
-            else -> "dialing"
+            else -> "dialing" // Default for outgoing
         }
         Log.d(TAG, "Call added: ${call.details.handle}, state: $stateStr")
         channel?.invokeMethod("callAdded", mapOf(
             "callId" to call.details.handle.toString(),
             "state" to stateStr
         ))
-        if (stateStr == "ringing") {
-            val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
-            wasPhoneLocked = keyguardManager.isKeyguardLocked
-            Log.d(TAG, "Phone locked at call added: $wasPhoneLocked")
-            showIncomingCallScreen(call.details.handle.toString().replace("tel:", ""))
-        }
         call.registerCallback(callCallback)
     }
 
     override fun onCallRemoved(call: Call) {
         super.onCallRemoved(call)
-        Log.d(TAG, "Call removed: ${call.details.handle}, wasPhoneLocked: $wasPhoneLocked")
+        Log.d(TAG, "Call removed: ${call.details.handle}")
         call.unregisterCallback(callCallback)
-        channel?.invokeMethod("callRemoved", mapOf(
-            "callId" to call.details.handle.toString(),
-            "wasPhoneLocked" to wasPhoneLocked
-        ))
+        channel?.invokeMethod("callRemoved", mapOf("callId" to call.details.handle.toString()))
         currentCall = null
-        cancelNotification()
     }
 
     override fun onCallAudioStateChanged(state: android.telecom.CallAudioState) {
@@ -98,59 +66,4 @@ class MyInCallService : InCallService() {
         Log.d(TAG, "Audio state changed: route=${state.route}")
         channel?.invokeMethod("audioStateChanged", mapOf("route" to state.route))
     }
-
-    private fun showIncomingCallScreen(phoneNumber: String) {
-        val intent = Intent(this, MainActivity::class.java).apply {
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
-            putExtra("phoneNumber", phoneNumber)
-            putExtra("isIncomingCall", true)
-            putExtra("showIncomingCallScreen", true)
-            putExtra("wasPhoneLocked", wasPhoneLocked)
-        }
-
-        val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
-        if (keyguardManager.isKeyguardLocked) {
-            startActivity(intent)
-            Log.d(TAG, "Launched MainActivity directly for locked screen, phoneNumber: $phoneNumber")
-        } else {
-            val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                val channel = NotificationChannel(
-                    NOTIFICATION_CHANNEL_ID,
-                    "Incoming Calls",
-                    NotificationManager.IMPORTANCE_HIGH
-                ).apply {
-                    description = "Notifications for incoming calls"
-                    enableVibration(true)
-                    setShowBadge(true)
-                }
-                notificationManager.createNotificationChannel(channel)
-            }
-
-            val pendingIntent = PendingIntent.getActivity(
-                this, 0, intent,
-                PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
-            )
-
-            val notification = NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
-                .setSmallIcon(android.R.drawable.ic_dialog_alert)
-                .setContentTitle("Incoming Call")
-                .setContentText("Call from $phoneNumber")
-                .setPriority(NotificationCompat.PRIORITY_HIGH)
-                .setFullScreenIntent(pendingIntent, true)
-                .setAutoCancel(true)
-                .setOngoing(true)
-                .build()
-
-            startActivity(intent)
-            notificationManager.notify(NOTIFICATION_ID, notification)
-            Log.d(TAG, "Launched MainActivity with notification for unlocked screen, phoneNumber: $phoneNumber")
-        }
-    }
-
-    private fun cancelNotification() {
-        val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        notificationManager.cancel(NOTIFICATION_ID)
-        Log.d(TAG, "Notification canceled")
-    }
 }

dialer/lib/features/call/call_page.dart

@@ -61,16 +61,9 @@ class _CallPageState extends State<CallPage> {
 
   void _hangUp() async {
     try {
-      final result = await _callService.hangUpCall(context);
-      print('CallPage: Hang up result: $result');
-      if (result["status"] == "ended" && mounted && Navigator.canPop(context)) {
-        Navigator.pop(context);
-      }
+      await _callService.hangUpCall(context);
     } catch (e) {
-      print("CallPage: Error hanging up: $e");
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text("Error hanging up: $e")),
-      );
+      print("Error hanging up: $e");
     }
   }
 
@@ -93,10 +86,9 @@ class _CallPageState extends State<CallPage> {
                   children: [
                     SizedBox(height: 35),
                     ObfuscatedAvatar(
-                      imageBytes: widget.thumbnail,
+                      imageBytes: widget.thumbnail, // Uses thumbnail if provided
                       radius: avatarRadius,
-                      backgroundColor:
-                          generateColorFromName(widget.displayName),
+                      backgroundColor: generateColorFromName(widget.displayName),
                       fallbackInitial: widget.displayName,
                     ),
                     const SizedBox(height: 4),
@@ -130,13 +122,11 @@ class _CallPageState extends State<CallPage> {
                     ),
                     Text(
                       widget.phoneNumber,
-                      style: TextStyle(
-                          fontSize: statusFontSize, color: Colors.white70),
+                      style: TextStyle(fontSize: statusFontSize, color: Colors.white70),
                     ),
                     Text(
                       'Calling...',
-                      style: TextStyle(
-                          fontSize: statusFontSize, color: Colors.white70),
+                      style: TextStyle(fontSize: statusFontSize, color: Colors.white70),
                     ),
                   ],
                 ),
@@ -167,8 +157,7 @@ class _CallPageState extends State<CallPage> {
                             IconButton(
                               padding: EdgeInsets.zero,
                               onPressed: _toggleKeypad,
-                              icon:
-                                  const Icon(Icons.close, color: Colors.white),
+                              icon: const Icon(Icons.close, color: Colors.white),
                             ),
                           ],
                         ),
@@ -204,8 +193,7 @@ class _CallPageState extends State<CallPage> {
                                 child: Center(
                                   child: Text(
                                     label,
-                                    style: const TextStyle(
-                                        fontSize: 32, color: Colors.white),
+                                    style: const TextStyle(fontSize: 32, color: Colors.white),
                                   ),
                                 ),
                               ),
@@ -237,8 +225,7 @@ class _CallPageState extends State<CallPage> {
                                     ),
                                     Text(
                                       isMuted ? 'Unmute' : 'Mute',
-                                      style: const TextStyle(
-                                          color: Colors.white, fontSize: 14),
+                                      style: const TextStyle(color: Colors.white, fontSize: 14),
                                     ),
                                   ],
                                 ),
@@ -247,13 +234,11 @@ class _CallPageState extends State<CallPage> {
                                   children: [
                                     IconButton(
                                       onPressed: _toggleKeypad,
-                                      icon: const Icon(Icons.dialpad,
-                                          color: Colors.white, size: 32),
+                                      icon: const Icon(Icons.dialpad, color: Colors.white, size: 32),
                                     ),
                                     const Text(
                                       'Keypad',
-                                      style: TextStyle(
-                                          color: Colors.white, fontSize: 14),
+                                      style: TextStyle(color: Colors.white, fontSize: 14),
                                     ),
                                   ],
                                 ),
@@ -263,19 +248,14 @@ class _CallPageState extends State<CallPage> {
                                     IconButton(
                                       onPressed: _toggleSpeaker,
                                       icon: Icon(
-                                        isSpeakerOn
-                                            ? Icons.volume_up
-                                            : Icons.volume_off,
-                                        color: isSpeakerOn
-                                            ? Colors.amber
-                                            : Colors.white,
+                                        isSpeakerOn ? Icons.volume_up : Icons.volume_off,
+                                        color: isSpeakerOn ? Colors.amber : Colors.white,
                                         size: 32,
                                       ),
                                     ),
                                     const Text(
                                       'Speaker',
-                                      style: TextStyle(
-                                          color: Colors.white, fontSize: 14),
+                                      style: TextStyle(color: Colors.white, fontSize: 14),
                                     ),
                                   ],
                                 ),
@@ -290,12 +270,10 @@ class _CallPageState extends State<CallPage> {
                                   children: [
                                     IconButton(
                                       onPressed: () {},
-                                      icon: const Icon(Icons.person_add,
-                                          color: Colors.white, size: 32),
+                                      icon: const Icon(Icons.person_add, color: Colors.white, size: 32),
                                     ),
                                     const Text('Add Contact',
-                                        style: TextStyle(
-                                            color: Colors.white, fontSize: 14)),
+                                        style: TextStyle(color: Colors.white, fontSize: 14)),
                                   ],
                                 ),
                                 Column(
@@ -303,12 +281,10 @@ class _CallPageState extends State<CallPage> {
                                   children: [
                                     IconButton(
                                       onPressed: () {},
-                                      icon: const Icon(Icons.sim_card,
-                                          color: Colors.white, size: 32),
+                                      icon: const Icon(Icons.sim_card, color: Colors.white, size: 32),
                                     ),
                                     const Text('Change SIM',
-                                        style: TextStyle(
-                                            color: Colors.white, fontSize: 14)),
+                                        style: TextStyle(color: Colors.white, fontSize: 14)),
                                   ],
                                 ),
                               ],

dialer/lib/features/composition/composition.dart

@@ -2,8 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_contacts/flutter_contacts.dart';
 import 'package:url_launcher/url_launcher.dart';
 import '../../services/contact_service.dart';
-import '../../services/obfuscate_service.dart';
-import '../../services/call_service.dart';
+import '../../services/obfuscate_service.dart'; // Import ObfuscateService
+import '../../services/call_service.dart'; // Import the CallService
+import '../contacts/widgets/add_contact_button.dart';
 
 class CompositionPage extends StatefulWidget {
   const CompositionPage({super.key});
@@ -17,7 +18,11 @@ class _CompositionPageState extends State<CompositionPage> {
   List<Contact> _allContacts = [];
   List<Contact> _filteredContacts = [];
   final ContactService _contactService = ContactService();
+
+  // Instantiate the ObfuscateService
   final ObfuscateService _obfuscateService = ObfuscateService();
+
+  // Instantiate the CallService
   final CallService _callService = CallService();
 
   @override
@@ -35,13 +40,8 @@ class _CompositionPageState extends State<CompositionPage> {
   void _filterContacts() {
     setState(() {
       _filteredContacts = _allContacts.where((contact) {
-        bool phoneMatch = contact.phones.any((phone) {
-          final rawPhoneNumber = phone.number;
-          final strippedPhoneNumber = rawPhoneNumber.replaceAll(RegExp(r'\D'), '');
-          final strippedDialedNumber = dialedNumber.replaceAll(RegExp(r'\D'), '');
-          return rawPhoneNumber.contains(dialedNumber) ||
-                 strippedPhoneNumber.contains(strippedDialedNumber);
-        });
+        final phoneMatch = contact.phones.any((phone) =>
+            phone.number.replaceAll(RegExp(r'\D'), '').contains(dialedNumber));
         final nameMatch = contact.displayName
             .toLowerCase()
             .contains(dialedNumber.toLowerCase());
@@ -57,13 +57,6 @@ class _CompositionPageState extends State<CompositionPage> {
     });
   }
 
-  void _onPlusPress() {
-    setState(() {
-      dialedNumber += '+';
-      _filterContacts();
-    });
-  }
-
   void _onDeletePress() {
     setState(() {
       if (dialedNumber.isNotEmpty) {
@@ -80,6 +73,7 @@ class _CompositionPageState extends State<CompositionPage> {
     });
   }
 
+  // Function to call a contact's number using the CallService
   void _makeCall(String phoneNumber) async {
     try {
       await _callService.makeGsmCall(context, phoneNumber: phoneNumber);
@@ -88,12 +82,10 @@ class _CompositionPageState extends State<CompositionPage> {
       });
     } catch (e) {
       debugPrint("Error making call: $e");
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('Failed to make call: $e')),
-      );
     }
   }
 
+  // Function to send an SMS to a contact's number
   void _launchSms(String phoneNumber) async {
     final uri = Uri(scheme: 'sms', path: phoneNumber);
     if (await canLaunchUrl(uri)) {
@@ -103,20 +95,6 @@ class _CompositionPageState extends State<CompositionPage> {
     }
   }
 
-  void _addContact() async {
-    if (await FlutterContacts.requestPermission()) {
-      final newContact = Contact()
-        ..phones = [Phone(dialedNumber.isNotEmpty ? dialedNumber : '')];
-      final updatedContact = await FlutterContacts.openExternalInsert(newContact);
-      if (updatedContact != null) {
-        _fetchContacts();
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text('Contact added successfully!')),
-        );
-      }
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -125,6 +103,7 @@ class _CompositionPageState extends State<CompositionPage> {
         children: [
           Column(
             children: [
+              // Top half: Display contacts matching dialed number
               Expanded(
                 flex: 2,
                 child: Container(
@@ -136,51 +115,57 @@ class _CompositionPageState extends State<CompositionPage> {
                     children: [
                       Expanded(
                         child: ListView(
-                          children: [
-                            ..._filteredContacts.map((contact) {
-                              final phoneNumber = contact.phones.isNotEmpty
-                                  ? contact.phones.first.number
-                                  : 'No phone number';
-                              return ListTile(
-                                title: Text(
-                                  _obfuscateService.obfuscateData(contact.displayName),
-                                  style: const TextStyle(color: Colors.white),
-                                ),
-                                subtitle: Text(
-                                  _obfuscateService.obfuscateData(phoneNumber),
-                                  style: const TextStyle(color: Colors.grey),
-                                ),
-                                trailing: Row(
-                                  mainAxisSize: MainAxisSize.min,
-                                  children: [
-                                    IconButton(
-                                      icon: Icon(Icons.phone, color: Colors.green[300], size: 20),
-                                      onPressed: () => _makeCall(phoneNumber),
-                                    ),
-                                    IconButton(
-                                      icon: Icon(Icons.message, color: Colors.blue[300], size: 20),
-                                      onPressed: () => _launchSms(phoneNumber),
-                                    ),
-                                  ],
-                                ),
-                                onTap: () {},
-                              );
-                            }).toList(),
-                            ListTile(
-                              title: const Text(
-                                'Add a contact',
-                                style: TextStyle(color: Colors.white),
+                          children: _filteredContacts.isNotEmpty
+                              ? _filteredContacts.map((contact) {
+                            final phoneNumber = contact.phones.isNotEmpty
+                                ? contact.phones.first.number
+                                : 'No phone number';
+                            return ListTile(
+                              title: Text(
+                                _obfuscateService.obfuscateData(contact.displayName),
+                                style: const TextStyle(color: Colors.white),
                               ),
-                              trailing: Icon(Icons.add, color: Colors.grey[600]),
-                              onTap: _addContact,
-                            ),
-                          ],
+                              subtitle: Text(
+                                _obfuscateService.obfuscateData(phoneNumber),
+                                style: const TextStyle(color: Colors.grey),
+                              ),
+                              trailing: Row(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  // Call button (Now using CallService)
+                                  IconButton(
+                                    icon: Icon(Icons.phone,
+                                        color: Colors.green[300],
+                                        size: 20),
+                                    onPressed: () {
+                                      _makeCall(phoneNumber); // Make a call using CallService
+                                    },
+                                  ),
+                                  // Message button
+                                  IconButton(
+                                    icon: Icon(Icons.message,
+                                        color: Colors.blue[300],
+                                        size: 20),
+                                    onPressed: () {
+                                      _launchSms(phoneNumber);
+                                    },
+                                  ),
+                                ],
+                              ),
+                              onTap: () {
+                                // Handle contact selection if needed
+                              },
+                            );
+                          }).toList()
+                              : [],
                         ),
                       ),
                     ],
                   ),
                 ),
               ),
+
+              // Bottom half: Dialpad and Dialed number display with erase button
               Expanded(
                 flex: 2,
                 child: Container(
@@ -188,6 +173,7 @@ class _CompositionPageState extends State<CompositionPage> {
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.start,
                     children: [
+                      // Display dialed number with erase button
                       Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
@@ -196,57 +182,61 @@ class _CompositionPageState extends State<CompositionPage> {
                               alignment: Alignment.center,
                               child: Text(
                                 dialedNumber,
-                                style: const TextStyle(fontSize: 24, color: Colors.white),
+                                style: const TextStyle(
+                                    fontSize: 24, color: Colors.white),
                                 overflow: TextOverflow.ellipsis,
                               ),
                             ),
                           ),
-                          GestureDetector(
-                            onTap: _onDeletePress,
-                            onLongPress: _onClearPress,
-                            child: const Padding(
-                              padding: EdgeInsets.all(8.0),
-                              child: Icon(Icons.backspace, color: Colors.white),
-                            ),
+                          IconButton(
+                            onPressed: _onClearPress,
+                            icon: const Icon(Icons.backspace,
+                                color: Colors.white),
                           ),
                         ],
                       ),
                       const SizedBox(height: 10),
+
+                      // Dialpad
                       Expanded(
                         child: SingleChildScrollView(
                           child: Column(
                             mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                             children: [
                               Row(
-                                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                                mainAxisAlignment:
+                                MainAxisAlignment.spaceEvenly,
                                 children: [
-                                  _buildDialButton('1', Colors.white),
-                                  _buildDialButton('2', Colors.white),
-                                  _buildDialButton('3', Colors.white),
+                                  _buildDialButton('1'),
+                                  _buildDialButton('2'),
+                                  _buildDialButton('3'),
                                 ],
                               ),
                               Row(
-                                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                                mainAxisAlignment:
+                                MainAxisAlignment.spaceEvenly,
                                 children: [
-                                  _buildDialButton('4', Colors.white),
-                                  _buildDialButton('5', Colors.white),
-                                  _buildDialButton('6', Colors.white),
+                                  _buildDialButton('4'),
+                                  _buildDialButton('5'),
+                                  _buildDialButton('6'),
                                 ],
                               ),
                               Row(
-                                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                                mainAxisAlignment:
+                                MainAxisAlignment.spaceEvenly,
                                 children: [
-                                  _buildDialButton('7', Colors.white),
-                                  _buildDialButton('8', Colors.white),
-                                  _buildDialButton('9', Colors.white),
+                                  _buildDialButton('7'),
+                                  _buildDialButton('8'),
+                                  _buildDialButton('9'),
                                 ],
                               ),
                               Row(
-                                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                                mainAxisAlignment:
+                                MainAxisAlignment.spaceEvenly,
                                 children: [
-                                  _buildDialButton('*', const Color.fromRGBO(117, 117, 117, 1)),
-                                  _buildDialButtonWithPlus('0'),
-                                  _buildDialButton('#', const Color.fromRGBO(117, 117, 117, 1)),
+                                  _buildDialButton('*'),
+                                  _buildDialButton('0'),
+                                  _buildDialButton('#'),
                                 ],
                               ),
                             ],
@@ -259,28 +249,26 @@ class _CompositionPageState extends State<CompositionPage> {
               ),
             ],
           ),
+
+          // Add Contact Button
           Positioned(
             bottom: 20.0,
             left: 0,
             right: 0,
             child: Center(
-              child: ElevatedButton(
-                onPressed: dialedNumber.isNotEmpty ? () => _makeCall(dialedNumber) : null,
-                style: ElevatedButton.styleFrom(
-                  backgroundColor: Colors.green[700],
-                  shape: const CircleBorder(),
-                  padding: const EdgeInsets.all(20),
-                ),
-                child: const Icon(Icons.phone, color: Colors.white, size: 30),
-              ),
+              child: AddContactButton(),
             ),
           ),
+
+          // Top Row with Back Arrow
           Positioned(
             top: 40.0,
             left: 16.0,
             child: IconButton(
               icon: const Icon(Icons.arrow_back, color: Colors.white),
-              onPressed: () => Navigator.pop(context),
+              onPressed: () {
+                Navigator.pop(context);
+              },
             ),
           ),
         ],
@@ -288,7 +276,7 @@ class _CompositionPageState extends State<CompositionPage> {
     );
   }
 
-  Widget _buildDialButton(String number, Color textColor) {
+  Widget _buildDialButton(String number) {
     return ElevatedButton(
       onPressed: () => _onNumberPress(number),
       style: ElevatedButton.styleFrom(
@@ -298,38 +286,11 @@ class _CompositionPageState extends State<CompositionPage> {
       ),
       child: Text(
         number,
-        style: TextStyle(fontSize: 24, color: textColor),
+        style: const TextStyle(
+          fontSize: 24,
+          color: Colors.white,
+        ),
       ),
     );
   }
-
-  Widget _buildDialButtonWithPlus(String number) {
-    return Stack(
-      alignment: Alignment.center,
-      children: [
-        GestureDetector(
-          onLongPress: _onPlusPress,
-          child: ElevatedButton(
-            onPressed: () => _onNumberPress(number),
-            style: ElevatedButton.styleFrom(
-              backgroundColor: Colors.black,
-              shape: const CircleBorder(),
-              padding: const EdgeInsets.all(16),
-            ),
-            child: Text(
-              number,
-              style: const TextStyle(fontSize: 24, color: Colors.white),
-            ),
-          ),
-        ),
-        Positioned(
-          bottom: 8,
-          child: Text(
-            '+',
-            style: TextStyle(fontSize: 12, color: Colors.grey[600]),
-          ),
-        ),
-      ],
-    );
-  }
 }

dialer/lib/features/history/history_page.dart

@@ -37,7 +37,7 @@ class HistoryPage extends StatefulWidget {
 }
 
 class _HistoryPageState extends State<HistoryPage>
-    with AutomaticKeepAliveClientMixin, SingleTickerProviderStateMixin {
+    with SingleTickerProviderStateMixin {
   List<History> histories = [];
   bool loading = true;
   int? _expandedIndex;
@@ -47,13 +47,10 @@ class _HistoryPageState extends State<HistoryPage>
   // Create a MethodChannel instance.
   static const MethodChannel _channel = MethodChannel('com.example.calllog');
 
-  @override
-  bool get wantKeepAlive => true; // Preserve state when switching pages
-
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    if (loading && histories.isEmpty) {
+    if (loading) {
       _buildHistories();
     }
   }
@@ -152,9 +149,9 @@ class _HistoryPageState extends State<HistoryPage>
     List<Contact> contacts = contactState.contacts;
 
     List<History> callHistories = [];
-    // Process each log entry with intermittent yields to avoid freezing.
-    for (int i = 0; i < nativeLogs.length; i++) {
-      final entry = nativeLogs[i];
+    // Process each log entry.
+    for (var entry in nativeLogs) {
+      // Each entry is a Map with keys: number, type, date, duration.
       final String number = entry['number'] ?? '';
       if (number.isEmpty) continue;
 
@@ -200,8 +197,6 @@ class _HistoryPageState extends State<HistoryPage>
 
       callHistories
           .add(History(matchedContact, callDate, callType, callStatus, 1));
-      // Yield every 10 iterations to avoid blocking the UI.
-      if (i % 10 == 0) await Future.delayed(Duration(milliseconds: 1));
     }
 
     // Sort histories by most recent.
@@ -277,7 +272,6 @@ class _HistoryPageState extends State<HistoryPage>
 
   @override
   Widget build(BuildContext context) {
-    super.build(context); // required due to AutomaticKeepAliveClientMixin
     final contactState = ContactState.of(context);
 
     if (loading || contactState.loading) {

dialer/lib/features/home/home_page.dart

@@ -10,82 +10,53 @@ import '../../services/contact_service.dart';
 import 'package:dialer/features/voicemail/voicemail_page.dart';
 import '../contacts/widgets/contact_modal.dart';
 
-class _MyHomePageState extends State<MyHomePage> with SingleTickerProviderStateMixin {
+
+class _MyHomePageState extends State<MyHomePage>
+    with SingleTickerProviderStateMixin {
   late TabController _tabController;
   List<Contact> _allContacts = [];
   List<Contact> _contactSuggestions = [];
   final ContactService _contactService = ContactService();
   final ObfuscateService _obfuscateService = ObfuscateService();
   final TextEditingController _searchController = TextEditingController();
-  late SearchController _searchBarController;
-  String _rawSearchInput = '';
+
 
   @override
   void initState() {
     super.initState();
-    _tabController = TabController(length: 4, vsync: this, initialIndex: 2);
+    // Set the TabController length to 4
+    _tabController = TabController(length: 4, vsync: this, initialIndex: 1);
     _tabController.addListener(_handleTabIndex);
-    _searchBarController = SearchController();
-    _searchBarController.addListener(() {
-      if (_searchController.text != _searchBarController.text) {
-        _rawSearchInput = _searchBarController.text;
-        _searchController.text = _rawSearchInput;
-        _onSearchChanged(_searchBarController.text);
-      }
-    });
     _fetchContacts();
   }
 
   void _fetchContacts() async {
     _allContacts = await _contactService.fetchContacts();
-    _contactSuggestions = List.from(_allContacts);
-    if (mounted) setState(() {});
+    setState(() {});
   }
 
   void _clearSearch() {
     _searchController.clear();
-    _searchBarController.clear();
-    _rawSearchInput = '';
     _onSearchChanged('');
   }
 
   void _onSearchChanged(String query) {
     setState(() {
       if (query.isEmpty) {
-        _contactSuggestions = List.from(_allContacts);
+        _contactSuggestions = List.from(_allContacts); // Reset suggestions
       } else {
-        final normalizedQuery = _normalizeString(query.toLowerCase());
         _contactSuggestions = _allContacts.where((contact) {
-          final normalizedName = _normalizeString(contact.displayName.toLowerCase());
-          return normalizedName.contains(normalizedQuery);
+          return contact.displayName
+              .toLowerCase()
+              .contains(query.toLowerCase());
         }).toList();
       }
     });
   }
 
-  String _normalizeString(String input) {
-    const accentMap = {
-      'àáâãäå': 'a',
-      'èéêë': 'e',
-      'ìíîï': 'i',
-      'òóôõö': 'o',
-      'ùúûü': 'u',
-      'ç': 'c',
-      'ñ': 'n',
-    };
-    String normalized = input;
-    accentMap.forEach((accents, base) {
-      for (var accent in accents.split('')) {
-        normalized = normalized.replaceAll(accent, base);
-      }
-    });
-    return normalized;
-  }
-
   @override
   void dispose() {
     _searchController.dispose();
-    _searchBarController.dispose();
     _tabController.removeListener(_handleTabIndex);
     _tabController.dispose();
     super.dispose();
@@ -98,18 +69,19 @@ class _MyHomePageState extends State<MyHomePage> with SingleTickerProviderStateM
   void _toggleFavorite(Contact contact) async {
     try {
       if (await FlutterContacts.requestPermission()) {
-        Contact? fullContact = await FlutterContacts.getContact(
-          contact.id,
-          withProperties: true,
-          withAccounts: true,
-          withPhoto: true,
-          withThumbnail: true,
-        );
+        Contact? fullContact = await FlutterContacts.getContact(contact.id,
+            withProperties: true,
+            withAccounts: true,
+            withPhoto: true,
+            withThumbnail: true);
 
         if (fullContact != null) {
           fullContact.isStarred = !fullContact.isStarred;
           await FlutterContacts.updateContact(fullContact);
-          _fetchContacts();
+          setState(() {
+            // Updating the contact list after toggling the favorite
+            _fetchContacts();
+          });
         }
       } else {
         print("Could not fetch contact details");
@@ -128,6 +100,7 @@ class _MyHomePageState extends State<MyHomePage> with SingleTickerProviderStateM
       backgroundColor: Colors.black,
       body: Column(
         children: [
+          // Persistent Search Bar
           Padding(
             padding: const EdgeInsets.only(
               top: 24.0,
@@ -145,33 +118,35 @@ class _MyHomePageState extends State<MyHomePage> with SingleTickerProviderStateM
                       border: Border.all(color: Colors.grey.shade800, width: 1),
                     ),
                     child: SearchAnchor(
-                      searchController: _searchBarController,
-                      builder: (BuildContext context, SearchController controller) {
+                      builder:
+                          (BuildContext context, SearchController controller) {
                         return GestureDetector(
                           onTap: () {
-                            controller.openView();
+                            controller.openView(); // Open the search view
                           },
                           child: Container(
                             decoration: BoxDecoration(
                               color: const Color.fromARGB(255, 30, 30, 30),
                               borderRadius: BorderRadius.circular(12.0),
-                              border: Border.all(color: Colors.grey.shade800, width: 1),
+                              border: Border.all(
+                                  color: Colors.grey.shade800, width: 1),
                             ),
-                            padding: const EdgeInsets.symmetric(vertical: 12.0, horizontal: 16.0),
+                            padding: const EdgeInsets.symmetric(
+                                vertical: 12.0, horizontal: 16.0),
                             child: Row(
                               children: [
-                                const Icon(Icons.search, color: Colors.grey, size: 24.0),
+                                const Icon(Icons.search,
+                                    color: Colors.grey, size: 24.0),
                                 const SizedBox(width: 8.0),
-                                Expanded(
-                                  child: Text(
-                                    _rawSearchInput.isEmpty
-                                        ? 'Search contacts'
-                                        : _rawSearchInput,
-                                    style: const TextStyle(color: Colors.grey, fontSize: 16.0),
-                                    overflow: TextOverflow.ellipsis,
-                                  ),
+                                Text(
+                                  _searchController.text.isEmpty
+                                      ? 'Search contacts'
+                                      : _searchController.text,
+                                  style: const TextStyle(
+                                      color: Colors.grey, fontSize: 16.0),
                                 ),
-                                if (_rawSearchInput.isNotEmpty)
+                                const Spacer(),
+                                if (_searchController.text.isNotEmpty)
                                   GestureDetector(
                                     onTap: _clearSearch,
                                     child: const Icon(
@@ -186,24 +161,23 @@ class _MyHomePageState extends State<MyHomePage> with SingleTickerProviderStateM
                         );
                       },
                       viewOnChanged: (query) {
-
-                        if (_searchBarController.text != query) {
-                          _rawSearchInput = query;
-                          _searchBarController.text = query;
-                          _searchController.text = query;
-                        }
-                        _onSearchChanged(query);
+                        _onSearchChanged(query); // Update immediately
                       },
-                      suggestionsBuilder: (BuildContext context, SearchController controller) {
+                      suggestionsBuilder:
+                          (BuildContext context, SearchController controller) {
                         return _contactSuggestions.map((contact) {
                           return ListTile(
                             key: ValueKey(contact.id),
-                            title: Text(
-                              _obfuscateService.obfuscateData(contact.displayName),
-                              style: const TextStyle(color: Colors.white),
-                            ),
+                            title: Text(_obfuscateService.obfuscateData(contact.displayName),
+                                style: const TextStyle(color: Colors.white)),
                             onTap: () {
+                              // Clear the search text input
+                              controller.text = '';
+
+                              // Close the search view
                               controller.closeView(contact.displayName);
+
+                              // Show the ContactModal when a contact is tapped
                               showModalBottomSheet(
                                 context: context,
                                 isScrollControlled: true,
@@ -212,28 +186,34 @@ class _MyHomePageState extends State<MyHomePage> with SingleTickerProviderStateM
                                   return ContactModal(
                                     contact: contact,
                                     onEdit: () async {
-                                      if (await FlutterContacts.requestPermission()) {
-                                        final updatedContact = await FlutterContacts
-                                            .openExternalEdit(contact.id);
+                                      if (await FlutterContacts
+                                          .requestPermission()) {
+                                        final updatedContact =
+                                            await FlutterContacts
+                                                .openExternalEdit(contact.id);
                                         if (updatedContact != null) {
                                           _fetchContacts();
                                           Navigator.of(context).pop();
-                                          ScaffoldMessenger.of(context).showSnackBar(
+                                          ScaffoldMessenger.of(context)
+                                              .showSnackBar(
                                             SnackBar(
                                               content: Text(
                                                   '${contact.displayName} updated successfully!'),
                                             ),
                                           );
                                         } else {
-                                          ScaffoldMessenger.of(context).showSnackBar(
+                                          ScaffoldMessenger.of(context)
+                                              .showSnackBar(
                                             SnackBar(
-                                              content: Text('Edit canceled or failed.'),
+                                              content: Text(
+                                                  'Edit canceled or failed.'),
                                             ),
                                           );
                                         }
                                       }
                                     },
-                                    onToggleFavorite: () => _toggleFavorite(contact),
+                                    onToggleFavorite: () =>
+                                        _toggleFavorite(contact),
                                     isFavorite: contact.isStarred,
                                   );
                                 },
@@ -245,6 +225,7 @@ class _MyHomePageState extends State<MyHomePage> with SingleTickerProviderStateM
                     ),
                   ),
                 ),
+                // 3-dot menu
                 PopupMenuButton<String>(
                   icon: const Icon(Icons.more_vert, color: Colors.white),
                   itemBuilder: (BuildContext context) => [
@@ -257,7 +238,8 @@ class _MyHomePageState extends State<MyHomePage> with SingleTickerProviderStateM
                     if (value == 'settings') {
                       Navigator.push(
                         context,
-                        MaterialPageRoute(builder: (context) => const SettingsPage()),
+                        MaterialPageRoute(
+                            builder: (context) => const SettingsPage()),
                       );
                     }
                   },
@@ -265,6 +247,7 @@ class _MyHomePageState extends State<MyHomePage> with SingleTickerProviderStateM
               ],
             ),
           ),
+          // Main content with TabBarView
           Expanded(
             child: Stack(
               children: [

dialer/lib/services/call_service.dart

@@ -1,20 +1,24 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import '../features/call/call_page.dart';
-import '../features/call/incoming_call_page.dart';
+import '../features/call/incoming_call_page.dart'; // Import the new page
 
 class CallService {
   static const MethodChannel _channel = MethodChannel('call_service');
   static String? currentPhoneNumber;
   static bool _isCallPageVisible = false;
-  static Map<String, dynamic>? _pendingCall;
-  static bool wasPhoneLocked = false;
 
   static final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
 
   CallService() {
     _channel.setMethodCallHandler((call) async {
-      print('CallService: Handling method call: ${call.method}');
+      final context = navigatorKey.currentContext;
+      print('CallService: Received method ${call.method} with args ${call.arguments}');
+      if (context == null) {
+        print('CallService: Navigator context is null, cannot navigate');
+        return;
+      }
+
       switch (call.method) {
         case "callAdded":
           final phoneNumber = call.arguments["callId"] as String;
@@ -22,86 +26,39 @@ class CallService {
           currentPhoneNumber = phoneNumber.replaceFirst('tel:', '');
           print('CallService: Call added, number: $currentPhoneNumber, state: $state');
           if (state == "ringing") {
-            _handleIncomingCall(phoneNumber);
+            _navigateToIncomingCallPage(context);
           } else {
-            _navigateToCallPage();
+            _navigateToCallPage(context);
           }
           break;
         case "callStateChanged":
           final state = call.arguments["state"] as String;
-          wasPhoneLocked = call.arguments["wasPhoneLocked"] as bool? ?? false;
-          print('CallService: State changed to $state, wasPhoneLocked: $wasPhoneLocked');
+          print('CallService: State changed to $state');
           if (state == "disconnected" || state == "disconnecting") {
-            _closeCallPage();
-            if (wasPhoneLocked) {
-              _channel.invokeMethod("callEndedFromFlutter");
-            }
+            _closeCallPage(context);
           } else if (state == "active" || state == "dialing") {
-            _navigateToCallPage();
+            _navigateToCallPage(context);
           } else if (state == "ringing") {
-            final phoneNumber = call.arguments["callId"] as String;
-            _handleIncomingCall(phoneNumber.replaceFirst('tel:', ''));
+            _navigateToIncomingCallPage(context);
           }
           break;
         case "callEnded":
         case "callRemoved":
-          wasPhoneLocked = call.arguments["wasPhoneLocked"] as bool? ?? false;
-          print('CallService: Call ended/removed, wasPhoneLocked: $wasPhoneLocked');
-          _closeCallPage();
-          if (wasPhoneLocked) {
-            _channel.invokeMethod("callEndedFromFlutter");
-          }
+          print('CallService: Call ended/removed');
+          _closeCallPage(context);
           currentPhoneNumber = null;
           break;
-        case "incomingCallFromNotification":
-          final phoneNumber = call.arguments["phoneNumber"] as String;
-          wasPhoneLocked = call.arguments["wasPhoneLocked"] as bool? ?? false;
-          currentPhoneNumber = phoneNumber;
-          print('CallService: Incoming call from notification: $phoneNumber, wasPhoneLocked: $wasPhoneLocked');
-          _handleIncomingCall(phoneNumber);
-          break;
       }
     });
   }
 
-  void _handleIncomingCall(String phoneNumber) {
-    final context = navigatorKey.currentContext;
-    if (context == null) {
-      print('CallService: Context is null, queuing incoming call: $phoneNumber');
-      _pendingCall = {"phoneNumber": phoneNumber};
-      Future.delayed(Duration(milliseconds: 500), () => _checkPendingCall());
-    } else {
-      _navigateToIncomingCallPage(context);
-    }
-  }
-
-  void _checkPendingCall() {
-    if (_pendingCall != null) {
-      final context = navigatorKey.currentContext;
-      if (context != null) {
-        print('CallService: Processing queued call: ${_pendingCall!["phoneNumber"]}');
-        currentPhoneNumber = _pendingCall!["phoneNumber"];
-        _navigateToIncomingCallPage(context);
-        _pendingCall = null;
-      } else {
-        print('CallService: Context still null, retrying...');
-        Future.delayed(Duration(milliseconds: 500), () => _checkPendingCall());
-      }
-    }
-  }
-
-  void _navigateToCallPage() {
-    final context = navigatorKey.currentContext;
-    if (context == null) {
-      print('CallService: Cannot navigate to CallPage, context is null');
-      return;
-    }
-    if (_isCallPageVisible) {
+  void _navigateToCallPage(BuildContext context) {
+    if (_isCallPageVisible && ModalRoute.of(context)?.settings.name == '/call') {
       print('CallService: CallPage already visible, skipping navigation');
       return;
     }
     print('CallService: Navigating to CallPage');
-    Navigator.push(
+    Navigator.pushReplacement(
       context,
       MaterialPageRoute(
         settings: const RouteSettings(name: '/call'),
@@ -113,13 +70,12 @@ class CallService {
       ),
     ).then((_) {
       _isCallPageVisible = false;
-      print('CallService: CallPage popped, _isCallPageVisible set to false');
     });
     _isCallPageVisible = true;
   }
 
   void _navigateToIncomingCallPage(BuildContext context) {
-    if (_isCallPageVisible) {
+    if (_isCallPageVisible && ModalRoute.of(context)?.settings.name == '/incoming_call') {
       print('CallService: IncomingCallPage already visible, skipping navigation');
       return;
     }
@@ -136,28 +92,23 @@ class CallService {
       ),
     ).then((_) {
       _isCallPageVisible = false;
-      print('CallService: IncomingCallPage popped, _isCallPageVisible set to false');
     });
     _isCallPageVisible = true;
   }
 
-  void _closeCallPage() {
-    final context = navigatorKey.currentContext;
-    if (context == null) {
-      print('CallService: Cannot close page, context is null');
+  void _closeCallPage(BuildContext context) {
+    if (!_isCallPageVisible) {
+      print('CallService: CallPage not visible, skipping pop');
       return;
     }
-    print('CallService: Closing call page, _isCallPageVisible: $_isCallPageVisible');
     if (Navigator.canPop(context)) {
-      print('CallService: Popping call page');
+      print('CallService: Popping CallPage');
       Navigator.pop(context);
       _isCallPageVisible = false;
-    } else {
-      print('CallService: No page to pop');
     }
   }
 
-  Future<Map<String, dynamic>> makeGsmCall(
+  Future<void> makeGsmCall(
     BuildContext context, {
     required String phoneNumber,
     String? displayName,
@@ -168,40 +119,36 @@ class CallService {
       print('CallService: Making GSM call to $phoneNumber');
       final result = await _channel.invokeMethod('makeGsmCall', {"phoneNumber": phoneNumber});
       print('CallService: makeGsmCall result: $result');
-      final resultMap = Map<String, dynamic>.from(result as Map);
-      if (resultMap["status"] != "calling") {
+      if (result["status"] != "calling") {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(content: Text("Failed to initiate call")),
         );
       }
-      return resultMap;
     } catch (e) {
       print("CallService: Error making call: $e");
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(content: Text("Error making call: $e")),
       );
-      return {"status": "error", "message": e.toString()};
+      rethrow;
     }
   }
 
-  Future<Map<String, dynamic>> hangUpCall(BuildContext context) async {
+  Future<void> hangUpCall(BuildContext context) async {
     try {
       print('CallService: Hanging up call');
       final result = await _channel.invokeMethod('hangUpCall');
       print('CallService: hangUpCall result: $result');
-      final resultMap = Map<String, dynamic>.from(result as Map);
-      if (resultMap["status"] != "ended") {
+      if (result["status"] != "ended") {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(content: Text("Failed to end call")),
         );
       }
-      return resultMap;
     } catch (e) {
       print("CallService: Error hanging up call: $e");
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(content: Text("Error hanging up call: $e")),
       );
-      return {"status": "error", "message": e.toString()};
+      rethrow;
     }
   }
 }

docs/beta_test_plan.md

@@ -27,13 +27,14 @@ The protocol definition will include as completed:
 - Handshakes
 - Real-time data-stream encryption (and decryption)
 - Encrypted stream compression
-- Transmission over audio stream (at least one modulation type)
-- First steps in FEC (Forward Error Correction): detecting half of transmission errors
+- Transmission over audio stream
+- Minimal error correction in audio-based transmission
+- Error handling and user prevention
 
 And should include prototype or scratches functionalities, among which:
-- Embedded silent data transmission (such as DTMF)
+- Embedded silent data transmission (silently transmit light data during an encrypted phone call)
 - On-the-fly key exchange (does not require prior key exchange, sacrifying some security)
-- Stronger FEC: detecting >80%, correcting 20% of transmission errors
+- Strong error correction
 
 #### The Icing dialer (based on Icing kotlin library, an Icing protocol implementation)
 
@@ -127,15 +128,16 @@ The remote bank advisor asks him to authenticate, making him type his password o
 By using the Icing protocol, not only would Jeff and the bank be assured that the informations are transmitted safely,
 but also that the call is coming from Jeff's phone and not an impersonator.
 
-Elise, 42 years-old, is a journalist covering sensitive topics.
-Her work draws attention from people who want to know what she's saying - and to whom.
-Forced to stay discreet, with unreliable signal and a likely monitored phone line,
-she uses Icing dialer to make secure calls without exposing herself.
+Elise is a 42 years-old extreme reporter.
+After interviewing Russians opposition's leader, the FSB is looking to interview her.
+She tries to stay discreet and hidden, but those measures constrains her to barely receive cellular network.
+She suspects her phone line to be monitored, so the best she can do to call safely, is to use her Icing dialer.
 
-Paul, a 22 years-old developer, is enjoying its vacations abroad.
+Paul, a 22 years-old developer working for a big company, decides to go to China for vacations.
 But everything goes wrong! The company's product he works on, is failling in the middle of the day and no one is
-qualified to fix it. Paul doesn't have WiFi and his phone plan only covers voice calls in his country.
-With Icing dialer, he can call his collegues and help fix the problem, completely safe.
+qualified to fix it. Paul doesn't have WiFi and his phone plan only covers voice calls in China.
+With Icing dialer, he can call his collegues and help fix the
+problem, safe from potential Chinese spies.
 
 ## Evaluation Criteria
 ### Protocol and lib

protocol_prototype/DryBox/Dockerfile

@@ -0,0 +1,14 @@
+# Use official Python image
+FROM python:3.9-slim
+
+# Set working directory
+WORKDIR /app
+
+# Copy the simulator script
+COPY gsm_simulator.py .
+
+# Expose the port
+EXPOSE 12345
+
+# Run the simulator
+CMD ["python", "gsm_simulator.py"]

protocol_prototype/DryBox/external_caller.py

@@ -0,0 +1,25 @@
+import socket
+
+import socket
+import time
+
+
+def connect():
+    caller_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    caller_socket.connect(('localhost', 5555))
+    caller_socket.send("CALLER".encode())
+    print("Connected to GSM simulator as CALLER")
+    time.sleep(2)  # Wait 2 seconds for receiver to connect
+
+    for i in range(5):
+        message = f"Audio packet {i + 1}"
+        caller_socket.send(message.encode())
+        print(f"Sent: {message}")
+        time.sleep(1)
+
+    caller_socket.send("CALL_END".encode())
+    print("Call ended.")
+    caller_socket.close()
+
+if __name__ == "__main__":
+    connect()

protocol_prototype/DryBox/external_receiver.py

@@ -0,0 +1,36 @@
+import socket
+
+def connect():
+    receiver_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    receiver_socket.settimeout(15)  # Increase timeout to 15 seconds
+    receiver_socket.connect(('localhost', 5555))
+    receiver_socket.send("RECEIVER".encode())
+    print("Connected to GSM simulator as RECEIVER")
+
+    while True:
+        try:
+            data = receiver_socket.recv(1024).decode().strip()
+            if not data:
+                print("No data received. Connection closed.")
+                break
+            if data == "RINGING":
+                print("Incoming call... ringing")
+            elif data == "CALL_END":
+                print("Call ended by caller.")
+                break
+            elif data == "CALL_DROPPED":
+                print("Call dropped by network.")
+                break
+            else:
+                print(f"Received: {data}")
+        except socket.timeout:
+            print("Timed out waiting for data.")
+            break
+        except Exception as e:
+            print(f"Receiver error: {e}")
+            break
+
+    receiver_socket.close()
+
+if __name__ == "__main__":
+    connect()

protocol_prototype/DryBox/gsm_simulator.py

@@ -0,0 +1,58 @@
+import socket
+import threading
+import time
+
+HOST = "0.0.0.0"
+PORT = 12345
+FRAME_SIZE = 1000
+FRAME_DELAY = 0.02
+
+clients = []
+
+def handle_client(client_sock, client_id):
+    print(f"Starting handle_client for Client {client_id}")
+    while True:
+        try:
+            other_client = clients[1 - client_id] if len(clients) == 2 else None
+            print(f"Client {client_id} waiting for data, other_client exists: {other_client is not None}")
+            data = client_sock.recv(1024)
+            if not data:
+                print(f"Client {client_id} disconnected or no data received")
+                break
+            if other_client:
+                for i in range(0, len(data), FRAME_SIZE):
+                    frame = data[i:i + FRAME_SIZE]
+                    other_client.send(frame)
+                    time.sleep(FRAME_DELAY)
+                print(f"Forwarded {len(data)} bytes from Client {client_id} to Client {1 - client_id}")
+        except Exception as e:
+            print(f"Error with Client {client_id}: {e}")
+            break
+    print(f"Closing connection for Client {client_id}")
+    client_sock.close()
+
+def start_simulator():
+    server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    server.bind((HOST, PORT))
+    server.listen(2)
+    print(f"GSM Simulator listening on {HOST}:{PORT}...")
+
+    while len(clients) < 2:
+        client_sock, addr = server.accept()
+        client_sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)  # Keep connection alive
+        clients.append(client_sock)
+        client_id = len(clients) - 1
+        print(f"Client {client_id} connected from {addr}")
+        threading.Thread(target=handle_client, args=(client_sock, client_id), daemon=True).start()
+
+    try:
+        while True:
+            time.sleep(1)
+    except KeyboardInterrupt:
+        print("Shutting down simulator...")
+        for client in clients:
+            client.close()
+        server.close()
+
+if __name__ == "__main__":
+    start_simulator()

protocol_prototype/DryBox/launch_gsm_simulator.sh

@@ -0,0 +1,66 @@
+#!/bin/bash
+
+# Script to launch the GSM Simulator in Docker
+
+# Variables
+IMAGE_NAME="gsm-simulator"
+CONTAINER_NAME="gsm-sim"
+PORT="5555"
+
+# Check if Docker is installed
+if ! command -v docker &> /dev/null; then
+    echo "Error: Docker is not installed. Please install Docker and try again."
+    exit 1
+fi
+
+# Check if the gsm_simulator.py file exists in the current directory
+if [ ! -f "gsm_simulator.py" ]; then
+    echo "Error: gsm_simulator.py not found in the current directory."
+    echo "Please ensure gsm_simulator.py is present and try again."
+    exit 1
+fi
+
+# Create Dockerfile if it doesn't exist
+if [ ! -f "Dockerfile" ]; then
+    echo "Creating Dockerfile..."
+    cat <<EOF > Dockerfile
+FROM python:3.9-slim
+WORKDIR /app
+COPY gsm_simulator.py /app
+CMD ["python", "gsm_simulator.py"]
+EOF
+fi
+
+# Build the Docker image
+echo "Building Docker image: $IMAGE_NAME..."
+docker build -t $IMAGE_NAME .
+
+# Check if the build was successful
+if [ $? -ne 0 ]; then
+    echo "Error: Failed to build Docker image."
+    exit 1
+fi
+
+# Stop and remove any existing container with the same name
+if [ "$(docker ps -q -f name=$CONTAINER_NAME)" ]; then
+    echo "Stopping existing container: $CONTAINER_NAME..."
+    docker stop $CONTAINER_NAME
+fi
+if [ "$(docker ps -aq -f name=$CONTAINER_NAME)" ]; then
+    echo "Removing existing container: $CONTAINER_NAME..."
+    docker rm $CONTAINER_NAME
+fi
+
+# Run the Docker container
+echo "Launching GSM Simulator in Docker container: $CONTAINER_NAME..."
+docker run -d -p $PORT:$PORT --name $CONTAINER_NAME $IMAGE_NAME
+
+# Check if the container is running
+if [ $? -eq 0 ]; then
+    echo "GSM Simulator is running on port $PORT."
+    echo "Container ID: $(docker ps -q -f name=$CONTAINER_NAME)"
+    echo "You can now connect your external Python programs to localhost:$PORT."
+else
+    echo "Error: Failed to launch the container."
+    exit 1
+fi

protocol_prototype/DryBox/protocol.py

@@ -0,0 +1,86 @@
+import socket
+import os
+import time
+import subprocess
+
+# Configuration
+HOST = "localhost"
+PORT = 12345
+INPUT_FILE = "input.wav"
+OUTPUT_FILE = "received.wav"
+
+
+def encrypt_data(data):
+    return data  # Replace with your encryption protocol
+
+
+def decrypt_data(data):
+    return data  # Replace with your decryption protocol
+
+
+def run_protocol(send_mode=True):
+    """Connect to the simulator and send/receive data."""
+    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    sock.connect((HOST, PORT))
+    print(f"Connected to simulator at {HOST}:{PORT}")
+
+    if send_mode:
+        # Sender mode: Encode audio with toast
+        os.system(f"toast -p -l {INPUT_FILE}")  # Creates input.wav.gsm
+        input_gsm_file = f"{INPUT_FILE}.gsm"
+        if not os.path.exists(input_gsm_file):
+            print(f"Error: {input_gsm_file} not created")
+            sock.close()
+            return
+        with open(input_gsm_file, "rb") as f:
+            voice_data = f.read()
+
+        encrypted_data = encrypt_data(voice_data)
+        sock.send(encrypted_data)
+        print(f"Sent {len(encrypted_data)} bytes")
+        os.remove(input_gsm_file)  # Clean up
+    else:
+        # Receiver mode: Wait for and receive data
+        print("Waiting for data from sender...")
+        received_data = b""
+        sock.settimeout(5.0)
+        try:
+            while True:
+                print("Calling recv()...")
+                data = sock.recv(1024)
+                print(f"Received {len(data)} bytes")
+                if not data:
+                    print("Connection closed by sender or simulator")
+                    break
+                received_data += data
+        except socket.timeout:
+            print("Timed out waiting for data")
+
+        if received_data:
+            with open("received.gsm", "wb") as f:
+                f.write(decrypt_data(received_data))
+            print(f"Wrote {len(received_data)} bytes to received.gsm")
+            # Decode with untoast, then convert to WAV with sox
+            result = subprocess.run(["untoast", "received.gsm"], capture_output=True, text=True)
+            print(f"untoast return code: {result.returncode}")
+            print(f"untoast stderr: {result.stderr}")
+            if result.returncode == 0:
+                if os.path.exists("received"):
+                    # Convert raw PCM to WAV (8 kHz, mono, 16-bit)
+                    subprocess.run(["sox", "-t", "raw", "-r", "8000", "-e", "signed", "-b", "16", "-c", "1", "received",
+                                    OUTPUT_FILE])
+                    os.remove("received")
+                    print(f"Received and saved {len(received_data)} bytes to {OUTPUT_FILE}")
+                else:
+                    print("Error: 'received' file not created by untoast")
+            else:
+                print(f"untoast failed: {result.stderr}")
+        else:
+            print("No data received from simulator")
+
+    sock.close()
+
+
+if __name__ == "__main__":
+    mode = input("Enter 'send' to send data or 'receive' to receive data: ").strip().lower()
+    run_protocol(send_mode=(mode == "send"))

protocol_prototype/IcingProtocol.drawio

@@ -0,0 +1,566 @@
+<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36" version="26.1.3" pages="2">
+  <diagram id="C5RBs43oDa-KdzZeNtuy" name="Logique">
+    <mxGraphModel dx="735" dy="407" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+      <root>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-0" />
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-1" parent="WIyWlLk6GJQsqaUBKTNV-0" />
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-2" value="" style="rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;edgeStyle=orthogonalEdgeStyle;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-3" target="WIyWlLk6GJQsqaUBKTNV-6" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-3" value="Alice appelle Bob" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;glass=0;strokeWidth=3;shadow=0;strokeColor=light-dark(#000000,#370FFF);" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="300" y="90" width="120" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-4" value="Yes" style="rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;edgeStyle=orthogonalEdgeStyle;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-0" target="WIyWlLk6GJQsqaUBKTNV-10" edge="1">
+          <mxGeometry y="20" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-5" value="No" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-6" target="WIyWlLk6GJQsqaUBKTNV-7" edge="1">
+          <mxGeometry y="10" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-6" value="Bob répond ?" style="rhombus;whiteSpace=wrap;html=1;shadow=0;fontFamily=Helvetica;fontSize=12;align=center;strokeWidth=1;spacing=6;spacingTop=-4;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="310" y="180" width="100" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-7" value="Rien ne se passe" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;glass=0;strokeWidth=1;shadow=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="460" y="200" width="120" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-8" value="Négativement" style="rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;edgeStyle=orthogonalEdgeStyle;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-10" target="WIyWlLk6GJQsqaUBKTNV-11" edge="1">
+          <mxGeometry y="40" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-9" value="Positivement" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-10" target="WIyWlLk6GJQsqaUBKTNV-12" edge="1">
+          <mxGeometry y="10" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-10" value="Bob ping..." style="whiteSpace=wrap;html=1;shadow=0;fontFamily=Helvetica;fontSize=12;align=center;strokeWidth=1;spacing=6;spacingTop=-4;shape=hexagon;perimeter=hexagonPerimeter2;fixedSize=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="310" y="390" width="100" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-11" value="Protocole échoué&lt;div&gt;-&lt;/div&gt;&lt;div&gt;Passage en clair&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;glass=0;strokeWidth=3;shadow=0;strokeColor=light-dark(#000000,#FF1414);" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="300" y="520" width="120" height="50" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-12" target="FXGPDhTRSO2FZSW48CnP-8" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="599.9999999999998" y="500" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-12" value="Alice envoi son&lt;span style=&quot;background-color: transparent; color: light-dark(rgb(0, 0, 0), rgb(255, 255, 255));&quot;&gt;&amp;nbsp;handshake a Bob&lt;/span&gt;" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;glass=0;strokeWidth=1;shadow=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="540" y="410" width="120" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-1" value="" style="rounded=0;html=1;jettySize=auto;orthogonalLoop=1;fontSize=11;endArrow=block;endFill=0;endSize=8;strokeWidth=1;shadow=0;labelBackgroundColor=none;edgeStyle=orthogonalEdgeStyle;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-6" target="FXGPDhTRSO2FZSW48CnP-0" edge="1">
+          <mxGeometry y="20" relative="1" as="geometry">
+            <mxPoint as="offset" />
+            <mxPoint x="360" y="260" as="sourcePoint" />
+            <mxPoint x="360" y="390" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-0" value="Le dialer d&#39;Alice envoi un PING a Bob" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;glass=0;strokeWidth=1;shadow=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="300" y="300" width="120" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-2" value="" style="endArrow=block;html=1;rounded=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;endFill=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;edgeStyle=orthogonalEdgeStyle;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="WIyWlLk6GJQsqaUBKTNV-10" target="FXGPDhTRSO2FZSW48CnP-4" edge="1">
+          <mxGeometry width="50" height="50" relative="1" as="geometry">
+            <mxPoint x="480" y="450" as="sourcePoint" />
+            <mxPoint x="190" y="430" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="280" y="430" />
+              <mxPoint x="280" y="460" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-3" value="Ne ping pas" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-2" vertex="1" connectable="0">
+          <mxGeometry x="-0.2695" relative="1" as="geometry">
+            <mxPoint x="-16" y="-10" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-4" target="FXGPDhTRSO2FZSW48CnP-0" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="130" y="320" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-6" value="Reping" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-5" vertex="1" connectable="0">
+          <mxGeometry x="0.0817" relative="1" as="geometry">
+            <mxPoint x="23" y="-10" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-4" value="Attendre 1s ? 0.5s ?" style="rounded=1;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="70" y="440" width="120" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-12" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-8" target="FXGPDhTRSO2FZSW48CnP-11" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="530.0380952380951" y="585.0038095238094" as="sourcePoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-13" value="Non" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-12" vertex="1" connectable="0">
+          <mxGeometry x="-0.4964" y="-1" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-43" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;endArrow=block;endFill=0;strokeColor=light-dark(#000000,#FF0000);" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-8" target="FXGPDhTRSO2FZSW48CnP-27" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="600" y="800" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="600" y="660" />
+              <mxPoint x="570" y="660" />
+              <mxPoint x="570" y="700" />
+              <mxPoint x="210" y="700" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-44" value="Oui" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-43" vertex="1" connectable="0">
+          <mxGeometry x="-0.8049" y="1" relative="1" as="geometry">
+            <mxPoint x="8" y="-25" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-8" value="Bob reconnait la clé publique d&#39;Alice ?" style="rhombus;whiteSpace=wrap;html=1;fontSize=10;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="540" y="545" width="120" height="75" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-11" target="WIyWlLk6GJQsqaUBKTNV-11" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="360" y="600" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-17" value="Non" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-16" vertex="1" connectable="0">
+          <mxGeometry x="-0.1233" y="-2" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-20" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-11" target="FXGPDhTRSO2FZSW48CnP-19" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-21" value="Oui" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-20" vertex="1" connectable="0">
+          <mxGeometry x="-0.275" y="1" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-11" value="Bob accepte la clé d&#39;Alice?" style="rhombus;whiteSpace=wrap;html=1;fontSize=10;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="354" y="620" width="120" height="75" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-23" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-19" target="FXGPDhTRSO2FZSW48CnP-22" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-19" value="Bob envoi sa clé publique en handshake" style="whiteSpace=wrap;html=1;fontSize=10;rounded=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="160" y="636.25" width="120" height="42.5" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-24" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-22" target="WIyWlLk6GJQsqaUBKTNV-11" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="70" y="545" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-25" value="Non" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-24" vertex="1" connectable="0">
+          <mxGeometry x="-0.7543" y="3" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-28" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-22" target="FXGPDhTRSO2FZSW48CnP-27" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="70" y="750" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-22" value="Alice accepte la clé publique de Bob&lt;span style=&quot;background-color: transparent; color: light-dark(rgb(0, 0, 0), rgb(255, 255, 255));&quot;&gt;&amp;nbsp;?&lt;/span&gt;" style="rhombus;whiteSpace=wrap;html=1;fontSize=10;rounded=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="30" y="617.5" width="80" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-47" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-26" target="FXGPDhTRSO2FZSW48CnP-46" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-26" value="Alice et Bob sont d&#39;accord sur la clé symmétrique a utiliser" style="rounded=0;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="340" y="820" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-31" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-27" target="FXGPDhTRSO2FZSW48CnP-30" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-45" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=light-dark(#000000,#FF1616);endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-27" target="FXGPDhTRSO2FZSW48CnP-26" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="210" y="850" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-27" value="Alice et Bob calculent le secret partagé de leur côté" style="whiteSpace=wrap;html=1;fontSize=10;rounded=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="150" y="720" width="120" height="50" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-33" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;jumpStyle=sharp;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-29" target="FXGPDhTRSO2FZSW48CnP-34" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="640" y="680" as="targetPoint" />
+            <Array as="points">
+              <mxPoint x="700" y="745" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-36" value="Non" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-33" vertex="1" connectable="0">
+          <mxGeometry x="-0.1536" y="1" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-41" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-29" target="FXGPDhTRSO2FZSW48CnP-26" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="525" y="798" />
+              <mxPoint x="510" y="798" />
+              <mxPoint x="510" y="850" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-42" value="Oui" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-41" vertex="1" connectable="0">
+          <mxGeometry x="-0.7774" y="1" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-29" value="Ils sont d&#39;accord ?" style="rhombus;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="460" y="715" width="130" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-32" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-30" target="FXGPDhTRSO2FZSW48CnP-29" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-30" value="Alice et Bob lisent à haute voix la phrase de sécurité" style="whiteSpace=wrap;html=1;fontSize=10;rounded=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="300" y="720" width="120" height="50" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-37" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-34" target="WIyWlLk6GJQsqaUBKTNV-12" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-38" value="Oui" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-37" vertex="1" connectable="0">
+          <mxGeometry x="-0.3086" y="-2" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-39" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;jumpStyle=sharp;jumpSize=8;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-34" target="WIyWlLk6GJQsqaUBKTNV-11" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="530" y="690" />
+              <mxPoint x="530" y="545" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-40" value="Non" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FXGPDhTRSO2FZSW48CnP-39" vertex="1" connectable="0">
+          <mxGeometry x="-0.7617" relative="1" as="geometry">
+            <mxPoint as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-34" value="Ré-essayer ?" style="rhombus;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="660" y="650" width="80" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-49" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="FXGPDhTRSO2FZSW48CnP-46" target="FXGPDhTRSO2FZSW48CnP-48" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-46" value="Alice et Bob utilisent la clé symmétrique pour chiffrer leurs transmissions" style="whiteSpace=wrap;html=1;rounded=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="340" y="920" width="120" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="FXGPDhTRSO2FZSW48CnP-48" value="" style="rhombus;whiteSpace=wrap;html=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="360" y="1020" width="80" height="80" as="geometry" />
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+  <diagram id="4Sb7mgJDpsadGym-U4wz" name="Echanges">
+    <mxGraphModel dx="1195" dy="683" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
+      <root>
+        <mxCell id="0" />
+        <mxCell id="1" parent="0" />
+        <mxCell id="b_xV4iUWIxmdZCAYY4YR-1" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;" parent="1" vertex="1">
+          <mxGeometry x="160" y="120" width="440" height="120" as="geometry" />
+        </mxCell>
+        <mxCell id="O_eM33N56VtHnDaMz1H4-1" value="ALICE" style="shape=umlLifeline;perimeter=lifelinePerimeter;whiteSpace=wrap;html=1;container=1;dropTarget=0;collapsible=0;recursiveResize=0;outlineConnect=0;portConstraint=eastwest;newEdgeStyle={&quot;curved&quot;:0,&quot;rounded&quot;:0};participant=umlEntity;strokeWidth=2;" parent="1" vertex="1">
+          <mxGeometry x="120" y="40" width="40" height="3110" as="geometry" />
+        </mxCell>
+        <mxCell id="O_eM33N56VtHnDaMz1H4-2" value="BOB" style="shape=umlLifeline;perimeter=lifelinePerimeter;whiteSpace=wrap;html=1;container=1;dropTarget=0;collapsible=0;recursiveResize=0;outlineConnect=0;portConstraint=eastwest;newEdgeStyle={&quot;curved&quot;:0,&quot;rounded&quot;:0};participant=umlEntity;strokeWidth=2;" parent="1" vertex="1">
+          <mxGeometry x="690" y="40" width="40" height="3110" as="geometry" />
+        </mxCell>
+        <mxCell id="b_xV4iUWIxmdZCAYY4YR-2" value="PING" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=23;" parent="1" vertex="1">
+          <mxGeometry x="385" y="65" width="80" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="n3lF8vaYaHAhAfaeaFZn-1" value="Nonce" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="180" y="130" width="105" height="80" as="geometry">
+            <mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="n3lF8vaYaHAhAfaeaFZn-6" value="&lt;div&gt;sha256 (&lt;/div&gt;&lt;div&gt;numéro alice +&lt;/div&gt;&lt;div&gt;numéro bob +&lt;/div&gt;&lt;div&gt;timestamp +&lt;/div&gt;&lt;div&gt;random&lt;br&gt;&lt;/div&gt;&lt;div&gt;) / ~2 (left part)&lt;br&gt;&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=7;" parent="n3lF8vaYaHAhAfaeaFZn-1" vertex="1">
+          <mxGeometry y="25" width="100" height="55" as="geometry" />
+        </mxCell>
+        <mxCell id="n3lF8vaYaHAhAfaeaFZn-2" value="Version" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="305" y="130" width="58.75" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-1" value="(0-128)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="n3lF8vaYaHAhAfaeaFZn-2">
+          <mxGeometry x="3.75" y="30" width="51.25" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="n3lF8vaYaHAhAfaeaFZn-4" value="Checksum" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="455" y="130" width="90" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="n3lF8vaYaHAhAfaeaFZn-7" value="CRC-32" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="n3lF8vaYaHAhAfaeaFZn-4" vertex="1">
+          <mxGeometry x="15" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-1" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;rotation=-180;" parent="1" vertex="1">
+          <mxGeometry x="280" y="280" width="410" height="190" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-2" value="Timestamp" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="300" y="290" width="90" height="60" as="geometry">
+            <mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-3" value="timestamp" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;strokeWidth=1;" parent="XvZTtdEB18xY6m2a5fJO-2" vertex="1">
+          <mxGeometry x="11.25" y="27.5" width="67.5" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-4" value="Version" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="405.63" y="290" width="58.75" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-11" value="0" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="XvZTtdEB18xY6m2a5fJO-4" vertex="1">
+          <mxGeometry y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-5" value="Checksum" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="590" y="380" width="85" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-6" value="CRC-32" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="XvZTtdEB18xY6m2a5fJO-5" vertex="1">
+          <mxGeometry x="12.5" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-9" value="Answer" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="482.5" y="290" width="57.5" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-10" value="&lt;div&gt;YES&lt;/div&gt;&lt;div&gt;NO&lt;br&gt;&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="484.38" y="315" width="53.75" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-13" value="HANDSHAKE" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=23;" parent="1" vertex="1">
+          <mxGeometry x="350" y="510" width="170" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-14" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;" parent="1" vertex="1">
+          <mxGeometry x="160" y="570" width="410" height="220" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-15" value="Clé éphémère" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="170" y="580" width="105" height="80" as="geometry">
+            <mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-13" value="Clé (publique) générée aléatoirement" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=11;" parent="XvZTtdEB18xY6m2a5fJO-15" vertex="1">
+          <mxGeometry y="30" width="100" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-17" value="Signature" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="285" y="580" width="105" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-14" value="PubkeyFixe. sign(clé éphémère)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="XvZTtdEB18xY6m2a5fJO-17" vertex="1">
+          <mxGeometry y="20" width="100" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-18" value="Checksum" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="486.25" y="580" width="65" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="XvZTtdEB18xY6m2a5fJO-19" value="CRC-32" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="XvZTtdEB18xY6m2a5fJO-18" vertex="1">
+          <mxGeometry x="2.5" y="30" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-15" value="PFS" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="402.81" y="580" width="71.88" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-16" value="hash( preuve de convo précédente)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;" parent="pP7SjZfcCiBg3d1TCkzP-15" vertex="1">
+          <mxGeometry x="6.57" y="30" width="60" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-17" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;rotation=-180;" parent="1" vertex="1">
+          <mxGeometry x="285" y="830" width="410" height="180" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-43" value="Clé éphémère" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="305" y="840" width="105" height="80" as="geometry">
+            <mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-44" value="Clé (publique) générée aléatoirement" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=11;" parent="pP7SjZfcCiBg3d1TCkzP-43" vertex="1">
+          <mxGeometry y="30" width="100" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-45" value="Signature" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="420" y="840" width="105" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-46" value="PubkeyFixe. sign(clé éphémère)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="pP7SjZfcCiBg3d1TCkzP-45" vertex="1">
+          <mxGeometry y="20" width="100" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-47" value="Checksum" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="621.25" y="840" width="65" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-48" value="CRC-32" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="pP7SjZfcCiBg3d1TCkzP-47" vertex="1">
+          <mxGeometry x="2.5" y="30" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-49" value="PFS" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="537.81" y="840" width="71.88" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-50" value="hash( preuve de convo précédente )" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;" parent="pP7SjZfcCiBg3d1TCkzP-49" vertex="1">
+          <mxGeometry x="6.57" y="30" width="60" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-54" value="Timestamp" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="182.5" y="690" width="80" height="70" as="geometry">
+            <mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-55" value="timestamp" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;strokeWidth=1;" parent="pP7SjZfcCiBg3d1TCkzP-54" vertex="1">
+          <mxGeometry x="6.25" y="32.5" width="67.5" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-56" value="Timestamp" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="606.25" y="930" width="80" height="70" as="geometry">
+            <mxRectangle x="210" y="130" width="80" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-57" value="timestamp" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=10;strokeWidth=1;" parent="pP7SjZfcCiBg3d1TCkzP-56" vertex="1">
+          <mxGeometry x="6.25" y="32.5" width="67.5" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-58" value="" style="html=1;shadow=0;dashed=0;align=center;verticalAlign=middle;shape=mxgraph.arrows2.arrow;dy=0;dx=10;notch=0;" parent="1" vertex="1">
+          <mxGeometry x="160" y="1160" width="450" height="200" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-59" value="ENCRYPTED COMS" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;fontSize=23;" parent="1" vertex="1">
+          <mxGeometry x="305" y="1100" width="240" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-60" value="129b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="200" y="210" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-61" value="7b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="303.75" y="210" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-62" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="470" y="210" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-63" value="= 172b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="530" y="210" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-66" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="313" y="350" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-67" value="7b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="406.75" y="350" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-68" value="1b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="479.25" y="350" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-69" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="600.5" y="440" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-70" value="= 76b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="426.25" y="420" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-71" value="264b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="193" y="660" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-72" value="512b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="307.5" y="660" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-73" value="256b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="409.38" y="660" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-74" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="488.75" y="660" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-75" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="192.5" y="760" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-76" value="=1096b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="315" y="750" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pP7SjZfcCiBg3d1TCkzP-77" value="=1096b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="327.5" y="970" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-1" value="CRC ?" style="swimlane;whiteSpace=wrap;html=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" parent="1" vertex="1">
+          <mxGeometry x="375" y="1270" width="63.25" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-2" value="CRC-32" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="_H5URFloX_BVB2BL7kO6-1" vertex="1">
+          <mxGeometry x="1.6199999999999992" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-3" value="Flag" style="swimlane;whiteSpace=wrap;html=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" parent="1" vertex="1">
+          <mxGeometry x="180" y="1170" width="65" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-4" value="To determine" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="_H5URFloX_BVB2BL7kO6-3" vertex="1">
+          <mxGeometry x="2.5" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-5" value="nbretry" style="swimlane;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+          <mxGeometry x="344.38" y="1170" width="65" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-6" value="y" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="_H5URFloX_BVB2BL7kO6-5" vertex="1">
+          <mxGeometry x="2.5" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-7" value="msg_len" style="swimlane;whiteSpace=wrap;html=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" parent="1" vertex="1">
+          <mxGeometry x="262.5" y="1170" width="65" height="60" as="geometry">
+            <mxRectangle x="262.5" y="1170" width="90" height="30" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-8" value="XXX" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="_H5URFloX_BVB2BL7kO6-7" vertex="1">
+          <mxGeometry x="2.5" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-9" value="msg" style="swimlane;whiteSpace=wrap;html=1;fillColor=#0050ef;fontColor=#ffffff;strokeColor=#001DBC;" parent="1" vertex="1">
+          <mxGeometry x="187.5" y="1270" width="65" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-10" value="BBB" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="_H5URFloX_BVB2BL7kO6-9" vertex="1">
+          <mxGeometry x="2.5" y="30" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-11" value="16b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="180" y="1230" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-12" value="8b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="349.38" y="1230" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-13" value="16b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="267.5" y="1230" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-14" value="96b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="510" y="1230" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-15" value="32b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="379.12" y="1330" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="_H5URFloX_BVB2BL7kO6-16" value="= (180b ~ 212b) + yyy" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+          <mxGeometry x="465" y="1285" width="130" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-2" value="Cypher" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="375" y="130" width="58.75" height="80" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-3" value="(0-16)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="pWkGvNQAXuiST1IiWYlx-2">
+          <mxGeometry x="3.75" y="30" width="51.25" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-4" value="4b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="375" y="210" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-5" value="Cypher" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="600" y="290" width="58.75" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-6" value="(0-16)" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="pWkGvNQAXuiST1IiWYlx-5">
+          <mxGeometry x="3.75" y="30" width="51.25" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-7" value="4b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="601.88" y="350" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-8" value="status" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="425" y="1170" width="65" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-9" value="CRC ?" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="pWkGvNQAXuiST1IiWYlx-8">
+          <mxGeometry x="2.5" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-10" value="4b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="428.75" y="1230" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-11" value="iv" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+          <mxGeometry x="505" y="1170" width="65" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-12" value="random&lt;div&gt;(+Z)&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="pWkGvNQAXuiST1IiWYlx-11">
+          <mxGeometry x="2.5" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-13" value="BBB b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="193" y="1330" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-14" value="MAC" style="swimlane;whiteSpace=wrap;html=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" vertex="1" parent="1">
+          <mxGeometry x="286.13" y="1270" width="63.25" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-15" value="AEAD" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="pWkGvNQAXuiST1IiWYlx-14">
+          <mxGeometry x="1.6199999999999992" y="25" width="60" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-16" value="128b" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+          <mxGeometry x="290.25" y="1330" width="55" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-17" value="Green = clear data" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" vertex="1" parent="1">
+          <mxGeometry x="10" y="1170" width="110" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-18" value="&lt;font style=&quot;color: light-dark(rgb(0, 0, 0), rgb(255, 255, 255));&quot;&gt;White = additional data&lt;/font&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fillColor=none;strokeColor=light-dark(#6C8EBF,#FFFFFF);" vertex="1" parent="1">
+          <mxGeometry y="1220" width="130" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="pWkGvNQAXuiST1IiWYlx-19" value="Blue = encrypted data" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fillColor=#0050ef;fontColor=#ffffff;strokeColor=#001DBC;" vertex="1" parent="1">
+          <mxGeometry x="10" y="1270" width="110" height="30" as="geometry" />
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+</mxfile>

protocol_prototype/auto_mode.py

@@ -0,0 +1,430 @@
+import time
+import threading
+import queue
+from typing import Optional, Dict, Any, List, Callable, Tuple
+
+# ANSI colors for logging
+RED = "\033[91m"
+GREEN = "\033[92m"
+YELLOW = "\033[93m"
+BLUE = "\033[94m"
+RESET = "\033[0m"
+
+class AutoModeConfig:
+    """Configuration parameters for the automatic mode behavior."""
+    def __init__(self):
+        # Ping behavior
+        self.ping_response_accept = True  # Whether to accept incoming pings
+        self.ping_auto_initiate = False   # Whether to initiate pings when connected
+        self.ping_retry_count = 3         # Number of ping retries
+        self.ping_retry_delay = 5.0       # Seconds between ping retries
+        self.ping_timeout = 10.0          # Seconds to wait for ping response
+        self.preferred_cipher = 0         # 0=AES-GCM, 1=ChaCha20-Poly1305
+        
+        # Handshake behavior
+        self.handshake_retry_count = 3    # Number of handshake retries
+        self.handshake_retry_delay = 5.0  # Seconds between handshake retries
+        self.handshake_timeout = 10.0     # Seconds to wait for handshake
+        
+        # Messaging behavior
+        self.auto_message_enabled = False # Whether to auto-send messages
+        self.message_interval = 10.0      # Seconds between auto messages
+        self.message_content = "Hello, secure world!"  # Default message
+        
+        # General behavior
+        self.active_mode = False          # If true, initiates protocol instead of waiting
+
+
+class AutoMode:
+    """
+    Manages automated behavior for the Icing protocol.
+    Handles automatic progression through the protocol stages:
+    1. Connection setup
+    2. Ping/discovery
+    3. Key exchange
+    4. Encrypted communication
+    """
+    
+    def __init__(self, protocol_interface):
+        """
+        Initialize the AutoMode manager.
+        
+        Args:
+            protocol_interface: An object implementing the required protocol methods
+        """
+        self.protocol = protocol_interface
+        self.config = AutoModeConfig()
+        self.active = False
+        self.state = "idle"
+        
+        # Message queue for automated sending
+        self.message_queue = queue.Queue()
+        
+        # Tracking variables
+        self.ping_attempts = 0
+        self.handshake_attempts = 0
+        self.last_action_time = 0
+        self.timer_tasks = []  # List of active timer tasks (for cleanup)
+        
+    def start(self):
+        """Start the automatic mode."""
+        if self.active:
+            return
+
+        self.active = True
+        self.state = "idle"
+        self.ping_attempts = 0
+        self.handshake_attempts = 0
+        self.last_action_time = time.time()
+        
+        self._log_info("Automatic mode started")
+        
+        # Start in active mode if configured
+        if self.config.active_mode and self.protocol.connections:
+            self._start_ping_sequence()
+            
+    def stop(self):
+        """Stop the automatic mode and clean up any pending tasks."""
+        if not self.active:
+            return
+            
+        # Cancel any pending timers
+        for timer in self.timer_tasks:
+            if timer.is_alive():
+                timer.cancel()
+        self.timer_tasks = []
+        
+        self.active = False
+        self.state = "idle"
+        self._log_info("Automatic mode stopped")
+    
+    def handle_connection_established(self):
+        """Called when a new connection is established."""
+        if not self.active:
+            return
+            
+        self._log_info("Connection established")
+        
+        # If in active mode, start pinging
+        if self.config.active_mode:
+            self._start_ping_sequence()
+    
+    def handle_ping_received(self, index: int):
+        """
+        Handle a received ping request.
+        
+        Args:
+            index: Index of the ping request in the protocol's inbound message queue
+        """
+        if not self.active or not self._is_valid_message_index(index):
+            return
+            
+        self._log_info(f"Ping request received (index={index})")
+        
+        # Automatically respond to ping if configured to accept
+        if self.config.ping_response_accept:
+            self._log_info(f"Auto-responding to ping with accept={self.config.ping_response_accept}")
+            try:
+                # Schedule the response with a small delay to simulate real behavior
+                timer = threading.Timer(0.5, self._respond_to_ping, args=[index])
+                timer.daemon = True
+                timer.start()
+                self.timer_tasks.append(timer)
+            except Exception as e:
+                self._log_error(f"Failed to auto-respond to ping: {e}")
+    
+    def handle_ping_response_received(self, accepted: bool):
+        """
+        Handle a received ping response.
+        
+        Args:
+            accepted: Whether the ping was accepted
+        """
+        if not self.active:
+            return
+            
+        self.ping_attempts = 0  # Reset ping attempts counter
+        
+        if accepted:
+            self._log_info("Ping accepted! Proceeding with handshake")
+            # Send handshake if not already done
+            if self.state != "handshake_sent":
+                self._ensure_ephemeral_keys()
+                self._start_handshake_sequence()
+        else:
+            self._log_info("Ping rejected by peer. Stopping auto-protocol sequence.")
+            self.state = "idle"
+    
+    def handle_handshake_received(self, index: int):
+        """
+        Handle a received handshake.
+        
+        Args:
+            index: Index of the handshake in the protocol's inbound message queue
+        """
+        if not self.active or not self._is_valid_message_index(index):
+            return
+            
+        self._log_info(f"Handshake received (index={index})")
+        
+        try:
+            # Ensure we have ephemeral keys
+            self._ensure_ephemeral_keys()
+            
+            # Process the handshake (compute ECDH)
+            self.protocol.generate_ecdhe(index)
+            
+            # Derive HKDF key
+            self.protocol.derive_hkdf()
+            
+            # If we haven't sent our handshake yet, send it
+            if self.state != "handshake_sent":
+                timer = threading.Timer(0.5, self.protocol.send_handshake)
+                timer.daemon = True
+                timer.start()
+                self.timer_tasks.append(timer)
+                self.state = "handshake_sent"
+            else:
+                self.state = "key_exchange_complete"
+                
+            # Start sending queued messages if auto messaging is enabled
+            if self.config.auto_message_enabled:
+                self._start_message_sequence()
+                
+        except Exception as e:
+            self._log_error(f"Failed to process handshake: {e}")
+    
+    def handle_encrypted_received(self, index: int):
+        """
+        Handle a received encrypted message.
+        
+        Args:
+            index: Index of the encrypted message in the protocol's inbound message queue
+        """
+        if not self.active or not self._is_valid_message_index(index):
+            return
+            
+        # Try to decrypt automatically
+        try:
+            plaintext = self.protocol.decrypt_received_message(index)
+            self._log_info(f"Auto-decrypted message: {plaintext}")
+        except Exception as e:
+            self._log_error(f"Failed to auto-decrypt message: {e}")
+    
+    def queue_message(self, message: str):
+        """
+        Add a message to the auto-send queue.
+        
+        Args:
+            message: Message text to send
+        """
+        self.message_queue.put(message)
+        self._log_info(f"Message queued for sending: {message}")
+        
+        # If we're in the right state, start sending messages
+        if self.active and self.state == "key_exchange_complete" and self.config.auto_message_enabled:
+            self._process_message_queue()
+    
+    def _start_ping_sequence(self):
+        """Start the ping sequence to discover the peer."""
+        if self.ping_attempts >= self.config.ping_retry_count:
+            self._log_warning(f"Maximum ping attempts ({self.config.ping_retry_count}) reached")
+            self.state = "idle"
+            return
+            
+        self.state = "pinging"
+        self.ping_attempts += 1
+        
+        self._log_info(f"Sending ping request (attempt {self.ping_attempts}/{self.config.ping_retry_count})")
+        try:
+            self.protocol.send_ping_request(self.config.preferred_cipher)
+            self.last_action_time = time.time()
+            
+            # Schedule next ping attempt if needed
+            timer = threading.Timer(
+                self.config.ping_retry_delay, 
+                self._check_ping_response
+            )
+            timer.daemon = True
+            timer.start()
+            self.timer_tasks.append(timer)
+            
+        except Exception as e:
+            self._log_error(f"Failed to send ping: {e}")
+    
+    def _check_ping_response(self):
+        """Check if we got a ping response, retry if not."""
+        if not self.active or self.state != "pinging":
+            return
+            
+        # If we've waited long enough for a response, retry
+        if time.time() - self.last_action_time >= self.config.ping_timeout:
+            self._log_warning("No ping response received, retrying")
+            self._start_ping_sequence()
+    
+    def _respond_to_ping(self, index: int):
+        """
+        Respond to a ping request.
+        
+        Args:
+            index: Index of the ping request in the inbound messages
+        """
+        if not self.active or not self._is_valid_message_index(index):
+            return
+            
+        try:
+            answer = 1 if self.config.ping_response_accept else 0
+            self.protocol.respond_to_ping(index, answer)
+            
+            if answer == 1:
+                # If we accepted, we should expect a handshake
+                self.state = "accepted_ping"
+                self._ensure_ephemeral_keys()
+                
+                # Set a timer to send our handshake if we don't receive one
+                timer = threading.Timer(
+                    self.config.handshake_timeout,
+                    self._check_handshake_received
+                )
+                timer.daemon = True
+                timer.start()
+                self.timer_tasks.append(timer)
+                self.last_action_time = time.time()
+                
+        except Exception as e:
+            self._log_error(f"Failed to respond to ping: {e}")
+    
+    def _check_handshake_received(self):
+        """Check if we've received a handshake after accepting a ping."""
+        if not self.active or self.state != "accepted_ping":
+            return
+            
+        # If we've waited long enough and haven't received a handshake, initiate one
+        if time.time() - self.last_action_time >= self.config.handshake_timeout:
+            self._log_warning("No handshake received after accepting ping, initiating handshake")
+            self._start_handshake_sequence()
+    
+    def _start_handshake_sequence(self):
+        """Start the handshake sequence."""
+        if self.handshake_attempts >= self.config.handshake_retry_count:
+            self._log_warning(f"Maximum handshake attempts ({self.config.handshake_retry_count}) reached")
+            self.state = "idle"
+            return
+            
+        self.state = "handshake_sent"
+        self.handshake_attempts += 1
+        
+        self._log_info(f"Sending handshake (attempt {self.handshake_attempts}/{self.config.handshake_retry_count})")
+        try:
+            self.protocol.send_handshake()
+            self.last_action_time = time.time()
+            
+            # Schedule handshake retry check
+            timer = threading.Timer(
+                self.config.handshake_retry_delay,
+                self._check_handshake_response
+            )
+            timer.daemon = True
+            timer.start()
+            self.timer_tasks.append(timer)
+            
+        except Exception as e:
+            self._log_error(f"Failed to send handshake: {e}")
+    
+    def _check_handshake_response(self):
+        """Check if we've completed the key exchange, retry handshake if not."""
+        if not self.active or self.state != "handshake_sent":
+            return
+            
+        # If we've waited long enough for a response, retry
+        if time.time() - self.last_action_time >= self.config.handshake_timeout:
+            self._log_warning("No handshake response received, retrying")
+            self._start_handshake_sequence()
+    
+    def _start_message_sequence(self):
+        """Start the automated message sending sequence."""
+        if not self.config.auto_message_enabled:
+            return
+            
+        self._log_info("Starting automated message sequence")
+        
+        # Add the default message if queue is empty
+        if self.message_queue.empty():
+            self.message_queue.put(self.config.message_content)
+            
+        # Start processing the queue
+        self._process_message_queue()
+    
+    def _process_message_queue(self):
+        """Process messages in the queue and send them."""
+        if not self.active or self.state != "key_exchange_complete" or not self.config.auto_message_enabled:
+            return
+            
+        if not self.message_queue.empty():
+            message = self.message_queue.get()
+            self._log_info(f"Sending queued message: {message}")
+            
+            try:
+                self.protocol.send_encrypted_message(message)
+                
+                # Schedule next message send
+                timer = threading.Timer(
+                    self.config.message_interval,
+                    self._process_message_queue
+                )
+                timer.daemon = True
+                timer.start()
+                self.timer_tasks.append(timer)
+                
+            except Exception as e:
+                self._log_error(f"Failed to send queued message: {e}")
+                # Put the message back in the queue
+                self.message_queue.put(message)
+    
+    def _ensure_ephemeral_keys(self):
+        """Ensure ephemeral keys are generated if needed."""
+        if not hasattr(self.protocol, 'ephemeral_pubkey') or self.protocol.ephemeral_pubkey is None:
+            self._log_info("Generating ephemeral keys")
+            self.protocol.generate_ephemeral_keys()
+            
+    def _is_valid_message_index(self, index: int) -> bool:
+        """
+        Check if a message index is valid in the protocol's inbound_messages queue.
+        
+        Args:
+            index: The index to check
+            
+        Returns:
+            bool: True if the index is valid, False otherwise
+        """
+        if not hasattr(self.protocol, 'inbound_messages'):
+            self._log_error("Protocol has no inbound_messages attribute")
+            return False
+            
+        if index < 0 or index >= len(self.protocol.inbound_messages):
+            self._log_error(f"Invalid message index: {index}")
+            return False
+            
+        return True
+    
+    # Helper methods for logging
+    def _log_info(self, message: str):
+        print(f"{BLUE}[AUTO]{RESET} {message}")
+        if hasattr(self, 'verbose_logging') and self.verbose_logging:
+            state_info = f"(state={self.state})"
+            if 'pinging' in self.state and hasattr(self, 'ping_attempts'):
+                state_info += f", attempts={self.ping_attempts}/{self.config.ping_retry_count}"
+            elif 'handshake' in self.state and hasattr(self, 'handshake_attempts'):
+                state_info += f", attempts={self.handshake_attempts}/{self.config.handshake_retry_count}"
+            print(f"{BLUE}[AUTO-DETAIL]{RESET} {state_info}")
+        
+    def _log_warning(self, message: str):
+        print(f"{YELLOW}[AUTO-WARN]{RESET} {message}")
+        if hasattr(self, 'verbose_logging') and self.verbose_logging:
+            timer_info = f"Active timers: {len(self.timer_tasks)}"
+            print(f"{YELLOW}[AUTO-WARN-DETAIL]{RESET} {timer_info}")
+        
+    def _log_error(self, message: str):
+        print(f"{RED}[AUTO-ERROR]{RESET} {message}")
+        if hasattr(self, 'verbose_logging') and self.verbose_logging:
+            print(f"{RED}[AUTO-ERROR-DETAIL]{RESET} Current state: {self.state}, Active: {self.active}") 

protocol_prototype/cli.py

@@ -0,0 +1,328 @@
+import sys
+import argparse
+import shlex
+from protocol import IcingProtocol
+
+RED = "\033[91m"
+GREEN = "\033[92m"
+YELLOW = "\033[93m"
+BLUE = "\033[94m"
+MAGENTA = "\033[95m"
+CYAN = "\033[96m"
+RESET = "\033[0m"
+
+def print_help():
+    """Display all available commands."""
+    print(f"\n{YELLOW}=== Available Commands ==={RESET}")
+    print(f"\n{CYAN}Basic Protocol Commands:{RESET}")
+    print("  help                       - Show this help message")
+    print("  peer_id <hex_pubkey>       - Set peer identity public key")
+    print("  connect <port>             - Connect to a peer at the specified port")
+    print("  show_state                 - Display current protocol state")
+    print("  exit                       - Exit the program")
+    
+    print(f"\n{CYAN}Manual Protocol Operation:{RESET}")
+    print("  generate_ephemeral_keys    - Generate ephemeral ECDH keys")
+    print("  send_ping [cipher]         - Send PING request (cipher: 0=AES-GCM, 1=ChaCha20-Poly1305, default: 0)")
+    print("  respond_ping <index> <0|1> - Respond to a PING (0=reject, 1=accept)")
+    print("  send_handshake             - Send handshake with ephemeral keys")
+    print("  generate_ecdhe <index>     - Process handshake at specified index")
+    print("  derive_hkdf                - Derive encryption key using HKDF")
+    print("  send_encrypted <plaintext> - Encrypt and send a message")
+    print("  decrypt <index>            - Decrypt received message at index")
+    
+    print(f"\n{CYAN}Automatic Mode Commands:{RESET}")
+    print("  auto start                 - Start automatic mode")
+    print("  auto stop                  - Stop automatic mode")
+    print("  auto status                - Show current auto mode status and configuration")
+    print("  auto config <param> <value> - Configure auto mode parameters")
+    print("  auto config list           - Show all configurable parameters")
+    print("  auto message <text>        - Queue message for automatic sending")
+    print("  auto passive               - Configure as passive peer (responds to pings but doesn't initiate)")
+    print("  auto active                - Configure as active peer (initiates protocol)")
+    print("  auto log                   - Toggle detailed logging for auto mode")
+    
+    print(f"\n{CYAN}Debugging Commands:{RESET}")
+    print("  debug_message <index>      - Display detailed information about a message in the queue")
+    
+    print(f"\n{CYAN}Legacy Commands:{RESET}")
+    print("  auto_responder <on|off>    - Enable/disable legacy auto responder (deprecated)")
+
+
+def main():
+    protocol = IcingProtocol()
+
+    print(f"{YELLOW}\n======================================")
+    print("   Icing Protocol - Secure Communication   ")
+    print("======================================\n" + RESET)
+    print(f"Listening on port: {protocol.local_port}")
+    print(f"Your identity public key (hex): {protocol.identity_pubkey.hex()}")
+    print_help()
+
+    while True:
+        try:
+            line = input(f"{MAGENTA}Cmd>{RESET} ").strip()
+        except EOFError:
+            break
+        if not line:
+            continue
+            
+        parts = shlex.split(line)  # Handle quoted arguments properly
+        cmd = parts[0].lower()
+        
+        try:
+            # Basic commands
+            if cmd == "exit":
+                protocol.stop()
+                break
+                
+            elif cmd == "help":
+                print_help()
+                
+            elif cmd == "show_state":
+                protocol.show_state()
+                
+            elif cmd == "peer_id":
+                if len(parts) != 2:
+                    print(f"{RED}[ERROR]{RESET} Usage: peer_id <hex_pubkey>")
+                    continue
+                try:
+                    protocol.set_peer_identity(parts[1])
+                except ValueError as e:
+                    print(f"{RED}[ERROR]{RESET} Invalid public key: {e}")
+                    
+            elif cmd == "connect":
+                if len(parts) != 2:
+                    print(f"{RED}[ERROR]{RESET} Usage: connect <port>")
+                    continue
+                try:
+                    port = int(parts[1])
+                    protocol.connect_to_peer(port)
+                except ValueError:
+                    print(f"{RED}[ERROR]{RESET} Invalid port number.")
+                except Exception as e:
+                    print(f"{RED}[ERROR]{RESET} Connection failed: {e}")
+            
+            # Manual protocol operation
+            elif cmd == "generate_ephemeral_keys":
+                protocol.generate_ephemeral_keys()
+                
+            elif cmd == "send_ping":
+                # Optional cipher parameter (0 = AES-GCM, 1 = ChaCha20-Poly1305)
+                cipher = 0  # Default to AES-GCM
+                if len(parts) >= 2:
+                    try:
+                        cipher = int(parts[1])
+                        if cipher not in (0, 1):
+                            print(f"{YELLOW}[WARNING]{RESET} Unsupported cipher code {cipher}. Using AES-GCM (0).")
+                            cipher = 0
+                    except ValueError:
+                        print(f"{YELLOW}[WARNING]{RESET} Invalid cipher code. Using AES-GCM (0).")
+                protocol.send_ping_request(cipher)
+                
+            elif cmd == "send_handshake":
+                protocol.send_handshake()
+                
+            elif cmd == "respond_ping":
+                if len(parts) != 3:
+                    print(f"{RED}[ERROR]{RESET} Usage: respond_ping <index> <0|1>")
+                    continue
+                try:
+                    idx = int(parts[1])
+                    answer = int(parts[2])
+                    if answer not in (0, 1):
+                        print(f"{RED}[ERROR]{RESET} Answer must be 0 (reject) or 1 (accept).")
+                        continue
+                    protocol.respond_to_ping(idx, answer)
+                except ValueError:
+                    print(f"{RED}[ERROR]{RESET} Index and answer must be integers.")
+                except Exception as e:
+                    print(f"{RED}[ERROR]{RESET} Failed to respond to ping: {e}")
+                    
+            elif cmd == "generate_ecdhe":
+                if len(parts) != 2:
+                    print(f"{RED}[ERROR]{RESET} Usage: generate_ecdhe <index>")
+                    continue
+                try:
+                    idx = int(parts[1])
+                    protocol.generate_ecdhe(idx)
+                except ValueError:
+                    print(f"{RED}[ERROR]{RESET} Index must be an integer.")
+                except Exception as e:
+                    print(f"{RED}[ERROR]{RESET} Failed to process handshake: {e}")
+                    
+            elif cmd == "derive_hkdf":
+                try:
+                    protocol.derive_hkdf()
+                except Exception as e:
+                    print(f"{RED}[ERROR]{RESET} Failed to derive HKDF key: {e}")
+                    
+            elif cmd == "send_encrypted":
+                if len(parts) < 2:
+                    print(f"{RED}[ERROR]{RESET} Usage: send_encrypted <plaintext>")
+                    continue
+                plaintext = " ".join(parts[1:])
+                try:
+                    protocol.send_encrypted_message(plaintext)
+                except Exception as e:
+                    print(f"{RED}[ERROR]{RESET} Failed to send encrypted message: {e}")
+                    
+            elif cmd == "decrypt":
+                if len(parts) != 2:
+                    print(f"{RED}[ERROR]{RESET} Usage: decrypt <index>")
+                    continue
+                try:
+                    idx = int(parts[1])
+                    protocol.decrypt_received_message(idx)
+                except ValueError:
+                    print(f"{RED}[ERROR]{RESET} Index must be an integer.")
+                except Exception as e:
+                    print(f"{RED}[ERROR]{RESET} Failed to decrypt message: {e}")
+                    
+            # Debugging commands
+            elif cmd == "debug_message":
+                if len(parts) != 2:
+                    print(f"{RED}[ERROR]{RESET} Usage: debug_message <index>")
+                    continue
+                try:
+                    idx = int(parts[1])
+                    protocol.debug_message(idx)
+                except ValueError:
+                    print(f"{RED}[ERROR]{RESET} Index must be an integer.")
+                except Exception as e:
+                    print(f"{RED}[ERROR]{RESET} Failed to debug message: {e}")
+            
+            # Automatic mode commands
+            elif cmd == "auto":
+                if len(parts) < 2:
+                    print(f"{RED}[ERROR]{RESET} Usage: auto <command> [options]")
+                    print("Available commands: start, stop, status, config, message, passive, active")
+                    continue
+                
+                subcmd = parts[1].lower()
+                
+                if subcmd == "start":
+                    protocol.start_auto_mode()
+                    print(f"{GREEN}[AUTO]{RESET} Automatic mode started")
+                
+                elif subcmd == "stop":
+                    protocol.stop_auto_mode()
+                    print(f"{GREEN}[AUTO]{RESET} Automatic mode stopped")
+                
+                elif subcmd == "status":
+                    config = protocol.get_auto_mode_config()
+                    print(f"{YELLOW}=== Auto Mode Status ==={RESET}")
+                    print(f"Active: {protocol.auto_mode.active}")
+                    print(f"State: {protocol.auto_mode.state}")
+                    print(f"\n{YELLOW}--- Configuration ---{RESET}")
+                    for key, value in vars(config).items():
+                        print(f"  {key}: {value}")
+                
+                elif subcmd == "config":
+                    if len(parts) < 3:
+                        print(f"{RED}[ERROR]{RESET} Usage: auto config <param> <value> or auto config list")
+                        continue
+                        
+                    if parts[2].lower() == "list":
+                        config = protocol.get_auto_mode_config()
+                        print(f"{YELLOW}=== Auto Mode Configuration Parameters ==={RESET}")
+                        for key, value in vars(config).items():
+                            print(f"  {key} ({type(value).__name__}): {value}")
+                        continue
+                    
+                    if len(parts) != 4:
+                        print(f"{RED}[ERROR]{RESET} Usage: auto config <param> <value>")
+                        continue
+                        
+                    param = parts[2]
+                    value_str = parts[3]
+                    
+                    # Convert the string value to the appropriate type
+                    config = protocol.get_auto_mode_config()
+                    if not hasattr(config, param):
+                        print(f"{RED}[ERROR]{RESET} Unknown parameter: {param}")
+                        print("Use 'auto config list' to see all available parameters")
+                        continue
+                        
+                    current_value = getattr(config, param)
+                    try:
+                        if isinstance(current_value, bool):
+                            if value_str.lower() in ("true", "yes", "on", "1"):
+                                value = True
+                            elif value_str.lower() in ("false", "no", "off", "0"):
+                                value = False
+                            else:
+                                raise ValueError(f"Boolean value must be true/false/yes/no/on/off/1/0")
+                        elif isinstance(current_value, int):
+                            value = int(value_str)
+                        elif isinstance(current_value, float):
+                            value = float(value_str)
+                        elif isinstance(current_value, str):
+                            value = value_str
+                        else:
+                            value = value_str  # Default to string
+                            
+                        protocol.configure_auto_mode(**{param: value})
+                        print(f"{GREEN}[AUTO]{RESET} Set {param} = {value}")
+                    
+                    except ValueError as e:
+                        print(f"{RED}[ERROR]{RESET} Invalid value for {param}: {e}")
+                
+                elif subcmd == "message":
+                    if len(parts) < 3:
+                        print(f"{RED}[ERROR]{RESET} Usage: auto message <text>")
+                        continue
+                    
+                    message = " ".join(parts[2:])
+                    protocol.queue_auto_message(message)
+                    print(f"{GREEN}[AUTO]{RESET} Message queued for sending: {message}")
+                
+                elif subcmd == "passive":
+                    # Configure as passive peer (responds but doesn't initiate)
+                    protocol.configure_auto_mode(
+                        ping_response_accept=True,
+                        ping_auto_initiate=False,
+                        active_mode=False
+                    )
+                    print(f"{GREEN}[AUTO]{RESET} Configured as passive peer")
+                
+                elif subcmd == "active":
+                    # Configure as active peer (initiates protocol)
+                    protocol.configure_auto_mode(
+                        ping_response_accept=True,
+                        ping_auto_initiate=True,
+                        active_mode=True
+                    )
+                    print(f"{GREEN}[AUTO]{RESET} Configured as active peer")
+                
+                else:
+                    print(f"{RED}[ERROR]{RESET} Unknown auto mode command: {subcmd}")
+                    print("Available commands: start, stop, status, config, message, passive, active")
+            
+            # Legacy commands
+            elif cmd == "auto_responder":
+                if len(parts) != 2:
+                    print(f"{RED}[ERROR]{RESET} Usage: auto_responder <on|off>")
+                    continue
+                val = parts[1].lower()
+                if val not in ("on", "off"):
+                    print(f"{RED}[ERROR]{RESET} Value must be 'on' or 'off'.")
+                    continue
+                protocol.enable_auto_responder(val == "on")
+                print(f"{YELLOW}[WARNING]{RESET} Using legacy auto responder. Consider using 'auto' commands instead.")
+                
+            else:
+                print(f"{RED}[ERROR]{RESET} Unknown command: {cmd}")
+                print("Type 'help' for a list of available commands.")
+                
+        except Exception as e:
+            print(f"{RED}[ERROR]{RESET} Command failed: {e}")
+
+if __name__ == "__main__":
+    try:
+        main()
+    except KeyboardInterrupt:
+        print("\nExiting...")
+    except Exception as e:
+        print(f"{RED}[FATAL ERROR]{RESET} {e}")
+        sys.exit(1)

protocol_prototype/crypto_utils.py

@@ -0,0 +1,165 @@
+import os
+from typing import Tuple
+from cryptography.exceptions import InvalidSignature
+from cryptography.hazmat.primitives import hashes, serialization
+from cryptography.hazmat.primitives.asymmetric import ec, utils
+from cryptography.hazmat.primitives.asymmetric.utils import decode_dss_signature, encode_dss_signature
+
+def generate_identity_keys() -> Tuple[ec.EllipticCurvePrivateKey, bytes]:
+    """
+    Generate an ECDSA (P-256) identity key pair.
+    
+    Returns:
+        Tuple containing:
+        - private_key: EllipticCurvePrivateKey object
+        - public_key_bytes: Raw x||y format (64 bytes, 512 bits)
+    """
+    private_key = ec.generate_private_key(ec.SECP256R1())
+    public_numbers = private_key.public_key().public_numbers()
+
+    x_bytes = public_numbers.x.to_bytes(32, byteorder='big')
+    y_bytes = public_numbers.y.to_bytes(32, byteorder='big')
+    pubkey_bytes = x_bytes + y_bytes  # 64 bytes total
+
+    return private_key, pubkey_bytes
+
+
+def load_peer_identity_key(pubkey_bytes: bytes) -> ec.EllipticCurvePublicKey:
+    """
+    Convert a raw public key (64 bytes, x||y format) to a cryptography public key object.
+    
+    Args:
+        pubkey_bytes: Raw 64-byte public key (x||y format)
+        
+    Returns:
+        EllipticCurvePublicKey object
+        
+    Raises:
+        ValueError: If the pubkey_bytes is not exactly 64 bytes
+    """
+    if len(pubkey_bytes) != 64:
+        raise ValueError("Peer identity pubkey must be exactly 64 bytes (x||y).")
+        
+    x_int = int.from_bytes(pubkey_bytes[:32], byteorder='big')
+    y_int = int.from_bytes(pubkey_bytes[32:], byteorder='big')
+    
+    public_numbers = ec.EllipticCurvePublicNumbers(x_int, y_int, ec.SECP256R1())
+    return public_numbers.public_key()
+
+
+def sign_data(private_key: ec.EllipticCurvePrivateKey, data: bytes) -> bytes:
+    """
+    Sign data with ECDSA using a P-256 private key.
+    
+    Args:
+        private_key: EllipticCurvePrivateKey for signing
+        data: Bytes to sign
+        
+    Returns:
+        DER-encoded signature (variable length, up to ~70-72 bytes)
+    """
+    signature = private_key.sign(data, ec.ECDSA(hashes.SHA256()))
+    return signature
+
+
+def verify_signature(public_key: ec.EllipticCurvePublicKey, signature: bytes, data: bytes) -> bool:
+    """
+    Verify a DER-encoded ECDSA signature.
+    
+    Args:
+        public_key: EllipticCurvePublicKey for verification
+        signature: DER-encoded signature
+        data: Original signed data
+        
+    Returns:
+        True if signature is valid, False otherwise
+    """
+    try:
+        public_key.verify(signature, data, ec.ECDSA(hashes.SHA256()))
+        return True
+    except InvalidSignature:
+        return False
+
+
+def get_ephemeral_keypair() -> Tuple[ec.EllipticCurvePrivateKey, bytes]:
+    """
+    Generate an ephemeral ECDH key pair (P-256).
+    
+    Returns:
+        Tuple containing:
+        - private_key: EllipticCurvePrivateKey object
+        - pubkey_bytes: Raw x||y format (64 bytes, 512 bits)
+    """
+    private_key = ec.generate_private_key(ec.SECP256R1())
+    numbers = private_key.public_key().public_numbers()
+    
+    x_bytes = numbers.x.to_bytes(32, 'big')
+    y_bytes = numbers.y.to_bytes(32, 'big')
+    
+    return private_key, x_bytes + y_bytes  # 64 bytes total
+
+
+def compute_ecdh_shared_key(private_key: ec.EllipticCurvePrivateKey, peer_pubkey_bytes: bytes) -> bytes:
+    """
+    Compute a shared secret using ECDH.
+    
+    Args:
+        private_key: Local ECDH private key
+        peer_pubkey_bytes: Peer's ephemeral public key (64 bytes, raw x||y format)
+        
+    Returns:
+        Shared secret bytes
+        
+    Raises:
+        ValueError: If peer_pubkey_bytes is not 64 bytes
+    """
+    if len(peer_pubkey_bytes) != 64:
+        raise ValueError("Peer public key must be 64 bytes (x||y format)")
+        
+    x_int = int.from_bytes(peer_pubkey_bytes[:32], 'big')
+    y_int = int.from_bytes(peer_pubkey_bytes[32:], 'big')
+    
+    # Create public key object from raw components
+    peer_public_numbers = ec.EllipticCurvePublicNumbers(x_int, y_int, ec.SECP256R1())
+    peer_public_key = peer_public_numbers.public_key()
+    
+    # Perform key exchange
+    shared_key = private_key.exchange(ec.ECDH(), peer_public_key)
+    return shared_key
+
+
+def der_to_raw(der_sig: bytes) -> bytes:
+    """
+    Convert a DER-encoded ECDSA signature to a raw 64-byte signature (r||s).
+    
+    Args:
+        der_sig: DER-encoded signature
+        
+    Returns:
+        Raw 64-byte signature (r||s format), with each component padded to 32 bytes
+    """
+    r, s = decode_dss_signature(der_sig)
+    r_bytes = r.to_bytes(32, byteorder='big')
+    s_bytes = s.to_bytes(32, byteorder='big')
+    return r_bytes + s_bytes
+
+
+def raw_signature_to_der(raw_sig: bytes) -> bytes:
+    """
+    Convert a raw signature (64 bytes, concatenated r||s) to DER-encoded signature.
+    
+    Args:
+        raw_sig: Raw 64-byte signature (r||s format)
+        
+    Returns:
+        DER-encoded signature
+        
+    Raises:
+        ValueError: If raw_sig is not 64 bytes
+    """
+    if len(raw_sig) != 64:
+        raise ValueError("Raw signature must be 64 bytes (r||s).")
+        
+    r = int.from_bytes(raw_sig[:32], 'big')
+    s = int.from_bytes(raw_sig[32:], 'big')
+    return encode_dss_signature(r, s)

protocol_prototype/encryption.py

@@ -0,0 +1,263 @@
+import os
+import struct
+from typing import Optional, Tuple
+from cryptography.hazmat.primitives.ciphers.aead import AESGCM, ChaCha20Poly1305
+
+class MessageHeader:
+    """
+    Header of an encrypted message (18 bytes total):
+    
+    Clear Text Section (4 bytes):
+    - flag: 16 bits (0xBEEF by default)
+    - data_len: 16 bits (length of encrypted payload excluding tag)
+    
+    Associated Data (14 bytes):
+    - retry: 8 bits (retry counter)
+    - connection_status: 4 bits (e.g., CRC required) + 4 bits padding
+    - iv/messageID: 96 bits (12 bytes)
+    """
+    def __init__(self, flag: int, data_len: int, retry: int, connection_status: int, iv: bytes):
+        if not (0 <= flag < 65536):
+            raise ValueError("Flag must fit in 16 bits (0..65535)")
+        if not (0 <= data_len < 65536):
+            raise ValueError("Data length must fit in 16 bits (0..65535)")
+        if not (0 <= retry < 256):
+            raise ValueError("Retry must fit in 8 bits (0..255)")
+        if not (0 <= connection_status < 16):
+            raise ValueError("Connection status must fit in 4 bits (0..15)")
+        if len(iv) != 12:
+            raise ValueError("IV must be 12 bytes (96 bits)")
+            
+        self.flag = flag                  # 16 bits
+        self.data_len = data_len          # 16 bits
+        self.retry = retry                # 8 bits
+        self.connection_status = connection_status  # 4 bits
+        self.iv = iv                      # 96 bits (12 bytes)
+
+    def pack(self) -> bytes:
+        """Pack header into 18 bytes."""
+        # Pack flag and data_len (4 bytes)
+        header = struct.pack('>H H', self.flag, self.data_len)
+        
+        # Pack retry and connection_status (2 bytes)
+        # connection_status in high 4 bits of second byte, 4 bits padding as zero
+        ad_byte = (self.connection_status & 0x0F) << 4
+        ad_packed = struct.pack('>B B', self.retry, ad_byte)
+        
+        # Append IV (12 bytes)
+        return header + ad_packed + self.iv
+        
+    def get_associated_data(self) -> bytes:
+        """Get the associated data for AEAD encryption (retry, conn_status, iv)."""
+        # Pack retry and connection_status
+        ad_byte = (self.connection_status & 0x0F) << 4
+        ad_packed = struct.pack('>B B', self.retry, ad_byte)
+        
+        # Append IV
+        return ad_packed + self.iv
+        
+    @classmethod
+    def unpack(cls, data: bytes) -> 'MessageHeader':
+        """Unpack 18 bytes into a MessageHeader object."""
+        if len(data) < 18:
+            raise ValueError(f"Header data too short: {len(data)} bytes, expected 18")
+            
+        flag, data_len = struct.unpack('>H H', data[:4])
+        retry, ad_byte = struct.unpack('>B B', data[4:6])
+        connection_status = (ad_byte >> 4) & 0x0F
+        iv = data[6:18]
+        
+        return cls(flag, data_len, retry, connection_status, iv)
+
+class EncryptedMessage:
+    """
+    Encrypted message packet format:
+    
+    - Header (18 bytes):
+      * flag: 16 bits
+      * data_len: 16 bits
+      * retry: 8 bits
+      * connection_status: 4 bits (+ 4 bits padding)
+      * iv/messageID: 96 bits (12 bytes)
+    
+    - Payload: variable length encrypted data
+    
+    - Footer:
+      * Authentication tag: 128 bits (16 bytes)
+      * CRC32: 32 bits (4 bytes) - optional, based on connection_status
+    """
+    def __init__(self, plaintext: bytes, key: bytes, flag: int = 0xBEEF, 
+                 retry: int = 0, connection_status: int = 0, iv: bytes = None,
+                 cipher_type: int = 0):
+        self.plaintext = plaintext
+        self.key = key
+        self.flag = flag
+        self.retry = retry
+        self.connection_status = connection_status
+        self.iv = iv or generate_iv(initial=True)
+        self.cipher_type = cipher_type  # 0 = AES-256-GCM, 1 = ChaCha20-Poly1305
+        
+        # Will be set after encryption
+        self.ciphertext = None
+        self.tag = None
+        self.header = None
+        
+    def encrypt(self) -> bytes:
+        """Encrypt the plaintext and return the full encrypted message."""
+        # Create header with correct data_len (which will be set after encryption)
+        self.header = MessageHeader(
+            flag=self.flag,
+            data_len=0,  # Will be updated after encryption
+            retry=self.retry,
+            connection_status=self.connection_status,
+            iv=self.iv
+        )
+        
+        # Get associated data for AEAD
+        aad = self.header.get_associated_data()
+        
+        # Encrypt using the appropriate cipher
+        if self.cipher_type == 0:  # AES-256-GCM
+            cipher = AESGCM(self.key)
+            ciphertext_with_tag = cipher.encrypt(self.iv, self.plaintext, aad)
+        elif self.cipher_type == 1:  # ChaCha20-Poly1305
+            cipher = ChaCha20Poly1305(self.key)
+            ciphertext_with_tag = cipher.encrypt(self.iv, self.plaintext, aad)
+        else:
+            raise ValueError(f"Unsupported cipher type: {self.cipher_type}")
+        
+        # Extract ciphertext and tag
+        self.tag = ciphertext_with_tag[-16:]
+        self.ciphertext = ciphertext_with_tag[:-16]
+        
+        # Update header with actual data length
+        self.header.data_len = len(self.ciphertext)
+        
+        # Pack everything together
+        packed_header = self.header.pack()
+        
+        # Check if CRC is required (based on connection_status)
+        if self.connection_status & 0x01:  # Lowest bit indicates CRC required
+            import zlib
+            # Compute CRC32 of header + ciphertext + tag
+            crc = zlib.crc32(packed_header + self.ciphertext + self.tag) & 0xffffffff
+            crc_bytes = struct.pack('>I', crc)
+            return packed_header + self.ciphertext + self.tag + crc_bytes
+        else:
+            return packed_header + self.ciphertext + self.tag
+            
+    @classmethod
+    def decrypt(cls, data: bytes, key: bytes, cipher_type: int = 0) -> Tuple[bytes, MessageHeader]:
+        """
+        Decrypt an encrypted message and return the plaintext and header.
+        
+        Args:
+            data: The full encrypted message
+            key: The encryption key
+            cipher_type: 0 for AES-256-GCM, 1 for ChaCha20-Poly1305
+            
+        Returns:
+            Tuple of (plaintext, header)
+        """
+        if len(data) < 18 + 16:  # Header + minimum tag size
+            raise ValueError("Message too short")
+            
+        # Extract header
+        header_bytes = data[:18]
+        header = MessageHeader.unpack(header_bytes)
+        
+        # Get ciphertext and tag
+        data_len = header.data_len
+        ciphertext_start = 18
+        ciphertext_end = ciphertext_start + data_len
+        
+        if ciphertext_end + 16 > len(data):
+            raise ValueError("Message length does not match header's data_len")
+            
+        ciphertext = data[ciphertext_start:ciphertext_end]
+        tag = data[ciphertext_end:ciphertext_end + 16]
+        
+        # Get associated data for AEAD
+        aad = header.get_associated_data()
+        
+        # Combine ciphertext and tag for decryption
+        ciphertext_with_tag = ciphertext + tag
+        
+        # Decrypt using the appropriate cipher
+        try:
+            if cipher_type == 0:  # AES-256-GCM
+                cipher = AESGCM(key)
+                plaintext = cipher.decrypt(header.iv, ciphertext_with_tag, aad)
+            elif cipher_type == 1:  # ChaCha20-Poly1305
+                cipher = ChaCha20Poly1305(key)
+                plaintext = cipher.decrypt(header.iv, ciphertext_with_tag, aad)
+            else:
+                raise ValueError(f"Unsupported cipher type: {cipher_type}")
+                
+            return plaintext, header
+        except Exception as e:
+            raise ValueError(f"Decryption failed: {e}")
+
+def generate_iv(initial: bool = False, previous_iv: bytes = None) -> bytes:
+    """
+    Generate a 96-bit IV (12 bytes).
+    
+    Args:
+        initial: If True, return a random IV
+        previous_iv: The previous IV to increment
+        
+    Returns:
+        A new IV
+    """
+    if initial or previous_iv is None:
+        return os.urandom(12)  # 96 bits
+    else:
+        # Increment the previous IV by 1 modulo 2^96
+        iv_int = int.from_bytes(previous_iv, 'big')
+        iv_int = (iv_int + 1) % (1 << 96)
+        return iv_int.to_bytes(12, 'big')
+
+# Convenience functions to match original API
+def encrypt_message(plaintext: bytes, key: bytes, flag: int = 0xBEEF, 
+                   retry: int = 0, connection_status: int = 0, 
+                   iv: bytes = None, cipher_type: int = 0) -> bytes:
+    """
+    Encrypt a message using the specified parameters.
+    
+    Args:
+        plaintext: The data to encrypt
+        key: The encryption key (32 bytes for AES-256-GCM, 32 bytes for ChaCha20-Poly1305)
+        flag: 16-bit flag value (default: 0xBEEF)
+        retry: 8-bit retry counter
+        connection_status: 4-bit connection status
+        iv: Optional 96-bit IV (if None, a random one will be generated)
+        cipher_type: 0 for AES-256-GCM, 1 for ChaCha20-Poly1305
+        
+    Returns:
+        The full encrypted message
+    """
+    message = EncryptedMessage(
+        plaintext=plaintext,
+        key=key,
+        flag=flag,
+        retry=retry,
+        connection_status=connection_status,
+        iv=iv,
+        cipher_type=cipher_type
+    )
+    return message.encrypt()
+
+def decrypt_message(message: bytes, key: bytes, cipher_type: int = 0) -> bytes:
+    """
+    Decrypt a message.
+    
+    Args:
+        message: The full encrypted message
+        key: The encryption key
+        cipher_type: 0 for AES-256-GCM, 1 for ChaCha20-Poly1305
+        
+    Returns:
+        The decrypted plaintext
+    """
+    plaintext, _ = EncryptedMessage.decrypt(message, key, cipher_type)
+    return plaintext

protocol_prototype/messages.py

@@ -0,0 +1,262 @@
+import os
+import struct
+import time
+import zlib
+import hashlib
+from typing import Tuple, Optional
+
+def crc32_of(data: bytes) -> int:
+    """
+    Compute CRC-32 of 'data'.
+    """
+    return zlib.crc32(data) & 0xffffffff
+
+
+# ---------------------------------------------------------------------------
+# PING REQUEST (new format)
+# Fields (in order):
+#   - session_nonce: 129 bits (from the top 129 bits of 17 random bytes)
+#   - version: 7 bits
+#   - cipher: 4 bits   (0 = AES-256-GCM, 1 = ChaCha20-poly1305; for now only 0 is used)
+#   - CRC: 32 bits
+#
+# Total bits: 129 + 7 + 4 + 32 = 172 bits. We pack into 22 bytes (176 bits) with 4 spare bits.
+# ---------------------------------------------------------------------------
+class PingRequest:
+    """
+    PING REQUEST format (172 bits / 22 bytes):
+    - session_nonce: 129 bits (from top 129 bits of 17 random bytes)
+    - version: 7 bits
+    - cipher: 4 bits (0 = AES-256-GCM, 1 = ChaCha20-poly1305)
+    - CRC: 32 bits
+    """
+    def __init__(self, version: int, cipher: int, session_nonce: bytes = None):
+        if not (0 <= version < 128):
+            raise ValueError("Version must fit in 7 bits (0..127)")
+        if not (0 <= cipher < 16):
+            raise ValueError("Cipher must fit in 4 bits (0..15)")
+        
+        self.version = version
+        self.cipher = cipher
+        
+        # Generate session nonce if not provided
+        if session_nonce is None:
+            # Generate 17 random bytes
+            nonce_full = os.urandom(17)
+            # Use top 129 bits
+            nonce_int_full = int.from_bytes(nonce_full, 'big')
+            nonce_129_int = nonce_int_full >> 7  # drop lowest 7 bits
+            self.session_nonce = nonce_129_int.to_bytes(17, 'big')
+        else:
+            if len(session_nonce) != 17:
+                raise ValueError("Session nonce must be 17 bytes (136 bits)")
+            self.session_nonce = session_nonce
+    
+    def serialize(self) -> bytes:
+        """Serialize the ping request into a 22-byte packet."""
+        # Convert session_nonce to integer (129 bits)
+        nonce_int = int.from_bytes(self.session_nonce, 'big')
+        
+        # Pack fields: shift nonce left by 11 bits, add version and cipher
+        partial_int = (nonce_int << 11) | (self.version << 4) | (self.cipher & 0x0F)
+        # This creates 129+7+4 = 140 bits; pack into 18 bytes
+        partial_bytes = partial_int.to_bytes(18, 'big')
+        
+        # Compute CRC over these 18 bytes
+        cval = crc32_of(partial_bytes)
+        
+        # Combine partial data with 32-bit CRC
+        final_int = (int.from_bytes(partial_bytes, 'big') << 32) | cval
+        return final_int.to_bytes(22, 'big')
+    
+    @classmethod
+    def deserialize(cls, data: bytes) -> Optional['PingRequest']:
+        """Deserialize a 22-byte packet into a PingRequest object."""
+        if len(data) != 22:
+            return None
+            
+        # Extract 176-bit integer
+        final_int = int.from_bytes(data, 'big')
+        
+        # Extract CRC and verify
+        crc_in = final_int & 0xffffffff
+        partial_int = final_int >> 32  # 140 bits
+        partial_bytes = partial_int.to_bytes(18, 'big')
+        crc_calc = crc32_of(partial_bytes)
+        
+        if crc_calc != crc_in:
+            return None
+            
+        # Extract fields
+        cipher = partial_int & 0x0F
+        version = (partial_int >> 4) & 0x7F
+        nonce_129_int = partial_int >> 11  # 129 bits
+        session_nonce = nonce_129_int.to_bytes(17, 'big')
+        
+        return cls(version, cipher, session_nonce)
+
+
+
+# ---------------------------------------------------------------------------
+# PING RESPONSE (new format)
+# Fields:
+#   - timestamp: 32 bits (we take the lower 32 bits of the time in ms)
+#   - version: 7 bits
+#   - cipher: 4 bits
+#   - answer: 1 bit
+#   - CRC: 32 bits
+#
+# Total bits: 32 + 7 + 4 + 1 + 32 = 76 bits; pack into 10 bytes (80 bits) with 4 spare bits.
+# ---------------------------------------------------------------------------
+class PingResponse:
+    """
+    PING RESPONSE format (76 bits / 10 bytes):
+    - timestamp: 32 bits (milliseconds since epoch, lower 32 bits)
+    - version: 7 bits
+    - cipher: 4 bits
+    - answer: 1 bit (0 = no, 1 = yes)
+    - CRC: 32 bits
+    """
+    def __init__(self, version: int, cipher: int, answer: int, timestamp: int = None):
+        if not (0 <= version < 128):
+            raise ValueError("Version must fit in 7 bits")
+        if not (0 <= cipher < 16):
+            raise ValueError("Cipher must fit in 4 bits")
+        if answer not in (0, 1):
+            raise ValueError("Answer must be 0 or 1")
+            
+        self.version = version
+        self.cipher = cipher
+        self.answer = answer
+        self.timestamp = timestamp or (int(time.time() * 1000) & 0xffffffff)
+    
+    def serialize(self) -> bytes:
+        """Serialize the ping response into a 10-byte packet."""
+        # Pack timestamp, version, cipher, answer: 32+7+4+1 = 44 bits
+        partial_val = (self.timestamp << (7+4+1)) | (self.version << (4+1)) | (self.cipher << 1) | self.answer
+        partial_bytes = partial_val.to_bytes(6, 'big')  # 6 bytes = 48 bits, 4 spare bits
+        
+        # Compute CRC
+        cval = crc32_of(partial_bytes)
+        
+        # Combine with CRC
+        final_val = (int.from_bytes(partial_bytes, 'big') << 32) | cval
+        return final_val.to_bytes(10, 'big')
+    
+    @classmethod
+    def deserialize(cls, data: bytes) -> Optional['PingResponse']:
+        """Deserialize a 10-byte packet into a PingResponse object."""
+        if len(data) != 10:
+            return None
+            
+        # Extract 80-bit integer
+        final_int = int.from_bytes(data, 'big')
+        
+        # Extract CRC and verify
+        crc_in = final_int & 0xffffffff
+        partial_int = final_int >> 32  # 48 bits
+        partial_bytes = partial_int.to_bytes(6, 'big')
+        crc_calc = crc32_of(partial_bytes)
+        
+        if crc_calc != crc_in:
+            return None
+            
+        # Extract fields (discard 4 spare bits)
+        partial_int >>= 4  # now 44 bits
+        answer = partial_int & 0x01
+        cipher = (partial_int >> 1) & 0x0F
+        version = (partial_int >> (1+4)) & 0x7F
+        timestamp = partial_int >> (1+4+7)
+        
+        return cls(version, cipher, answer, timestamp)
+
+
+# =============================================================================
+# 3) Handshake
+#    - 32-bit timestamp
+#    - 64-byte ephemeral pubkey (raw x||y = 512 bits)
+#    - 64-byte ephemeral signature (raw r||s = 512 bits)
+#    - 32-byte PFS hash (256 bits)
+#    - 32-bit CRC
+#    => total 4 + 64 + 64 + 32 + 4 = 168 bytes = 1344 bits
+# =============================================================================
+
+class Handshake:
+    """
+    HANDSHAKE format (1344 bits / 168 bytes):
+    - timestamp: 32 bits
+    - ephemeral_pubkey: 512 bits (64 bytes, raw x||y format)
+    - ephemeral_signature: 512 bits (64 bytes, raw r||s format)
+    - pfs_hash: 256 bits (32 bytes)
+    - CRC: 32 bits
+    """
+    def __init__(self, ephemeral_pubkey: bytes, ephemeral_signature: bytes, pfs_hash: bytes, timestamp: int = None):
+        if len(ephemeral_pubkey) != 64:
+            raise ValueError("ephemeral_pubkey must be 64 bytes (raw x||y)")
+        if len(ephemeral_signature) != 64:
+            raise ValueError("ephemeral_signature must be 64 bytes (raw r||s)")
+        if len(pfs_hash) != 32:
+            raise ValueError("pfs_hash must be 32 bytes")
+            
+        self.ephemeral_pubkey = ephemeral_pubkey
+        self.ephemeral_signature = ephemeral_signature
+        self.pfs_hash = pfs_hash
+        self.timestamp = timestamp or (int(time.time() * 1000) & 0xffffffff)
+    
+    def serialize(self) -> bytes:
+        """Serialize the handshake into a 168-byte packet."""
+        # Pack timestamp and other fields
+        partial = struct.pack("!I", self.timestamp) + self.ephemeral_pubkey + self.ephemeral_signature + self.pfs_hash
+        
+        # Compute CRC
+        cval = crc32_of(partial)
+        
+        # Append CRC
+        return partial + struct.pack("!I", cval)
+    
+    @classmethod
+    def deserialize(cls, data: bytes) -> Optional['Handshake']:
+        """Deserialize a 168-byte packet into a Handshake object."""
+        if len(data) != 168:
+            return None
+            
+        # Extract and verify CRC
+        partial = data[:-4]
+        crc_in = struct.unpack("!I", data[-4:])[0]
+        crc_calc = crc32_of(partial)
+        
+        if crc_calc != crc_in:
+            return None
+            
+        # Extract fields
+        timestamp = struct.unpack("!I", partial[:4])[0]
+        ephemeral_pubkey = partial[4:4+64]
+        ephemeral_signature = partial[68:68+64]
+        pfs_hash = partial[132:132+32]
+        
+        return cls(ephemeral_pubkey, ephemeral_signature, pfs_hash, timestamp)
+
+
+# =============================================================================
+# 4) PFS Hash Helper
+#    If no previous session, return 32 zero bytes
+#    Otherwise, compute sha256(session_number || last_shared_secret).
+# =============================================================================
+
+def compute_pfs_hash(session_number: int, shared_secret_hex: str) -> bytes:
+    """
+    Compute the PFS hash field for handshake messages:
+    - If no previous session (session_number < 0), return 32 zero bytes
+    - Otherwise, compute sha256(session_number || shared_secret)
+    """
+    if session_number < 0:
+        return b"\x00" * 32
+
+    # Convert shared_secret_hex to raw bytes
+    secret_bytes = bytes.fromhex(shared_secret_hex)
+    
+    # Pack session_number as 4 bytes
+    sn_bytes = struct.pack("!I", session_number)
+    
+    # Compute hash
+    return hashlib.sha256(sn_bytes + secret_bytes).digest()

protocol_prototype/protocol.py

@@ -0,0 +1,815 @@
+import random
+import os
+import time
+import threading
+from typing import List, Dict, Any, Optional, Tuple
+
+from crypto_utils import (
+    generate_identity_keys,
+    load_peer_identity_key,
+    sign_data,
+    verify_signature,
+    get_ephemeral_keypair,
+    compute_ecdh_shared_key,
+    der_to_raw,
+    raw_signature_to_der
+)
+from messages import (
+    PingRequest, PingResponse, Handshake,
+    compute_pfs_hash
+)
+import transmission
+from encryption import (
+    EncryptedMessage, MessageHeader,
+    generate_iv, encrypt_message, decrypt_message
+)
+from auto_mode import AutoMode, AutoModeConfig
+
+# ANSI colors
+RED = "\033[91m"
+GREEN = "\033[92m"
+YELLOW = "\033[93m"
+BLUE = "\033[94m"
+RESET = "\033[0m"
+
+
+class IcingProtocol:
+    def __init__(self):
+        # Identity keys (each 512 bits when printed as hex of 64 bytes)
+        self.identity_privkey, self.identity_pubkey = generate_identity_keys()
+
+        # Peer identity for verifying ephemeral signatures
+        self.peer_identity_pubkey_obj = None
+        self.peer_identity_pubkey_bytes = None
+
+        # Ephemeral keys (our side)
+        self.ephemeral_privkey = None
+        self.ephemeral_pubkey = None
+
+        # Last computed shared secret (hex string)
+        self.shared_secret = None
+
+        # Derived HKDF key (hex string, 256 bits)
+        self.hkdf_key = None
+        
+        # Negotiated cipher (0 = AES-256-GCM, 1 = ChaCha20-Poly1305)
+        self.cipher_type = 0
+
+        # For PFS: track per-peer session info (session number and last shared secret)
+        self.pfs_history: Dict[bytes, Tuple[int, str]] = {}
+
+        # Protocol flags
+        self.state = {
+            "ping_sent": False,
+            "ping_received": False,
+            "handshake_sent": False,
+            "handshake_received": False,
+            "key_exchange_complete": False
+        }
+
+        # Auto mode for automated protocol operation
+        self.auto_mode = AutoMode(self)
+        
+        # Legacy auto-responder toggle (kept for backward compatibility)
+        self.auto_responder = False
+
+        # Active connections list
+        self.connections = []
+
+        # Inbound messages (each message is a dict with keys: type, raw, parsed, connection)
+        self.inbound_messages: List[Dict[str, Any]] = []
+
+        # Store the session nonce (17 bytes but only 129 bits are valid) from first sent or received PING
+        self.session_nonce: bytes = None
+        
+        # Last used IV for encrypted messages
+        self.last_iv: bytes = None
+
+        self.local_port = random.randint(30000, 40000)
+        self.server_listener = transmission.ServerListener(
+            host="127.0.0.1",
+            port=self.local_port,
+            on_new_connection=self.on_new_connection,
+            on_data_received=self.on_data_received
+        )
+        self.server_listener.start()
+
+    # -------------------------------------------------------------------------
+    # Transport callbacks
+    # -------------------------------------------------------------------------
+
+    def on_new_connection(self, conn: transmission.PeerConnection):
+        print(f"{GREEN}[IcingProtocol]{RESET} New incoming connection.")
+        self.connections.append(conn)
+        
+        # Notify auto mode
+        self.auto_mode.handle_connection_established()
+
+    def on_data_received(self, conn: transmission.PeerConnection, data: bytes):
+        bits_count = len(data) * 8
+        print(
+            f"{GREEN}[RECV]{RESET} {bits_count} bits from peer: {data.hex()[:60]}{'...' if len(data.hex()) > 60 else ''}")
+
+        # PING REQUEST (22 bytes)
+        if len(data) == 22:
+            ping_request = PingRequest.deserialize(data)
+            if ping_request:
+                self.state["ping_received"] = True
+                
+                # If received cipher is not supported, force to 0 (AES-256-GCM)
+                if ping_request.cipher != 0 and ping_request.cipher != 1:
+                    print(f"{YELLOW}[NOTICE]{RESET} Received PING with unsupported cipher ({ping_request.cipher}); forcing cipher to 0 in response.")
+                    ping_request.cipher = 0
+                
+                # Store cipher type for future encrypted messages
+                self.cipher_type = ping_request.cipher
+                    
+                # Store session nonce if not already set
+                if self.session_nonce is None:
+                    self.session_nonce = ping_request.session_nonce
+                    print(f"{YELLOW}[NOTICE]{RESET} Stored session nonce from received PING.")
+                
+                index = len(self.inbound_messages)
+                msg = {
+                    "type": "PING_REQUEST",
+                    "raw": data,
+                    "parsed": ping_request,
+                    "connection": conn
+                }
+                self.inbound_messages.append(msg)
+                
+                # Handle in auto mode (if active)
+                self.auto_mode.handle_ping_received(index)
+                
+                # Legacy auto-responder (for backward compatibility)
+                if self.auto_responder and not self.auto_mode.active:
+                    timer = threading.Timer(2.0, self._auto_respond_ping, args=[index])
+                    timer.daemon = True
+                    timer.start()
+                return
+
+        # PING RESPONSE (10 bytes)
+        elif len(data) == 10:
+            ping_response = PingResponse.deserialize(data)
+            if ping_response:
+                # Store negotiated cipher type
+                self.cipher_type = ping_response.cipher
+                
+                index = len(self.inbound_messages)
+                msg = {
+                    "type": "PING_RESPONSE",
+                    "raw": data,
+                    "parsed": ping_response,
+                    "connection": conn
+                }
+                self.inbound_messages.append(msg)
+                
+                # Notify auto mode (if active)
+                self.auto_mode.handle_ping_response_received(ping_response.answer == 1)
+                return
+
+        # HANDSHAKE message (168 bytes)
+        elif len(data) == 168:
+            handshake = Handshake.deserialize(data)
+            if handshake:
+                self.state["handshake_received"] = True
+                index = len(self.inbound_messages)
+                msg = {
+                    "type": "HANDSHAKE",
+                    "raw": data,
+                    "parsed": handshake,
+                    "connection": conn
+                }
+                self.inbound_messages.append(msg)
+                
+                # Notify auto mode (if active)
+                self.auto_mode.handle_handshake_received(index)
+                
+                # Legacy auto-responder
+                if self.auto_responder and not self.auto_mode.active:
+                    timer = threading.Timer(2.0, self._auto_respond_handshake, args=[index])
+                    timer.daemon = True
+                    timer.start()
+                return
+
+        # Check if the message might be an encrypted message (e.g. header of 18 bytes at start)
+        elif len(data) >= 18:
+            # Try to parse header
+            try:
+                header = MessageHeader.unpack(data[:18])
+                # If header unpacking is successful and data length matches header expectations
+                expected_len = 18 + header.data_len + 16  # Header + payload + tag
+                
+                # Check if CRC is included
+                has_crc = (header.connection_status & 0x01) != 0
+                if has_crc:
+                    expected_len += 4  # Add CRC32 length
+                    
+                if len(data) >= expected_len:
+                    index = len(self.inbound_messages)
+                    msg = {
+                        "type": "ENCRYPTED_MESSAGE",
+                        "raw": data,
+                        "parsed": header,
+                        "connection": conn
+                    }
+                    self.inbound_messages.append(msg)
+                    print(f"{YELLOW}[NOTICE]{RESET} Stored inbound ENCRYPTED_MESSAGE at index={index}.")
+                    
+                    # Notify auto mode
+                    self.auto_mode.handle_encrypted_received(index)
+                    return
+            except Exception as e:
+                print(f"{RED}[ERROR]{RESET} Failed to parse message header: {e}")
+
+        # Otherwise, unrecognized/malformed message.
+        index = len(self.inbound_messages)
+        msg = {
+            "type": "UNKNOWN",
+            "raw": data,
+            "parsed": None,
+            "connection": conn
+        }
+        self.inbound_messages.append(msg)
+        print(f"{RED}[WARNING]{RESET} Unrecognized or malformed message stored at index={index}.")
+
+
+    # -------------------------------------------------------------------------
+    # HKDF Derivation
+    # -------------------------------------------------------------------------
+
+    def derive_hkdf(self):
+        """
+        Derives a 256-bit key using HKDF.
+        Uses as input keying material (IKM) the shared secret from ECDH.
+        The salt is computed as SHA256(session_nonce || pfs_param), where:
+          - session_nonce is taken from self.session_nonce (17 bytes, 129 bits) or defaults to zeros.
+          - pfs_param is taken from the first inbound HANDSHAKE's pfs_hash field (32 bytes) or zeros.
+        """
+        if not self.shared_secret:
+            print(f"{RED}[ERROR]{RESET} No shared secret available; cannot derive HKDF key.")
+            return
+
+        # IKM: shared secret converted from hex to bytes.
+        ikm = bytes.fromhex(self.shared_secret)
+        # Use stored session_nonce if available; otherwise default to zeros.
+        session_nonce = self.session_nonce if self.session_nonce is not None else (b"\x00" * 17)
+
+        # Determine pfs_param from first HANDSHAKE message (if any)
+        pfs_param = None
+        for msg in self.inbound_messages:
+            if msg["type"] == "HANDSHAKE":
+                try:
+                    handshake = msg["parsed"]
+                    pfs_param = handshake.pfs_hash
+                except Exception:
+                    pfs_param = None
+                break
+        if pfs_param is None:
+            print(f"{RED}[WARNING]{RESET} No HANDSHAKE found; using 32 zero bytes for pfs_param.")
+            pfs_param = b"\x00" * 32  # 256-bit zeros
+
+        # Ensure both are bytes
+        if isinstance(session_nonce, str):
+            session_nonce = session_nonce.encode()
+        if isinstance(pfs_param, str):
+            pfs_param = pfs_param.encode()
+
+        from cryptography.hazmat.primitives import hashes
+        from cryptography.hazmat.primitives.kdf.hkdf import HKDF
+        hasher = hashes.Hash(hashes.SHA256())
+        hasher.update(session_nonce + pfs_param)
+        salt_value = hasher.finalize()
+
+        hkdf = HKDF(
+            algorithm=hashes.SHA256(),
+            length=32,  # 256 bits
+            salt=salt_value,
+            info=b"",
+        )
+        derived_key = hkdf.derive(ikm)
+        self.hkdf_key = derived_key.hex()
+        self.state["key_exchange_complete"] = True
+        print(f"{GREEN}[HKDF]{RESET} Derived HKDF key: {self.hkdf_key}")
+        return True
+
+    # -------------------------------------------------------------------------
+    # Legacy Auto-responder helpers (kept for backward compatibility)
+    # -------------------------------------------------------------------------
+
+    def _auto_respond_ping(self, index: int):
+        """
+        Called by a Timer to respond automatically to a PING_REQUEST after 2s.
+        """
+        print(f"{BLUE}[AUTO]{RESET} Delayed responding to PING at index={index}")
+        self.respond_to_ping(index, answer=1)  # Accept by default
+        self.show_state()
+
+    def _auto_respond_handshake(self, index: int):
+        """
+        Called by a Timer to handle inbound HANDSHAKE automatically.
+        1) Generate ephemeral keys if not already set
+        2) Compute ECDH with the inbound ephemeral pub (generate_ecdhe)
+        3) Send our handshake back
+        4) Show state
+        """
+        print(f"{BLUE}[AUTO]{RESET} Delayed ECDH process for HANDSHAKE at index={index}")
+
+        # 1) Generate ephemeral keys if we don't have them
+        if not self.ephemeral_privkey or not self.ephemeral_pubkey:
+            self.generate_ephemeral_keys()
+
+        # 2) Compute ECDH from inbound ephemeral pub
+        self.generate_ecdhe(index)
+
+        # 3) Send our handshake to the peer
+        self.send_handshake()
+
+        # 4) Show final state
+        self.show_state()
+
+    # -------------------------------------------------------------------------
+    # Public Methods for Auto Mode Management
+    # -------------------------------------------------------------------------
+    
+    def start_auto_mode(self):
+        """Start the automatic protocol operation mode."""
+        self.auto_mode.start()
+        
+    def stop_auto_mode(self):
+        """Stop the automatic protocol operation mode."""
+        self.auto_mode.stop()
+        
+    def configure_auto_mode(self, **kwargs):
+        """
+        Configure the automatic mode parameters.
+        
+        Args:
+            **kwargs: Configuration parameters to set. Supported parameters:
+                - ping_response_accept: bool, whether to accept incoming pings
+                - ping_auto_initiate: bool, whether to initiate pings on connection
+                - ping_retry_count: int, number of ping retries
+                - ping_retry_delay: float, seconds between ping retries
+                - ping_timeout: float, seconds to wait for ping response
+                - preferred_cipher: int, preferred cipher (0=AES-GCM, 1=ChaCha20-Poly1305)
+                - handshake_retry_count: int, number of handshake retries
+                - handshake_retry_delay: float, seconds between handshake retries
+                - handshake_timeout: float, seconds to wait for handshake
+                - auto_message_enabled: bool, whether to auto-send messages
+                - message_interval: float, seconds between auto messages
+                - message_content: str, default message content
+                - active_mode: bool, whether to actively initiate protocol
+        """
+        for key, value in kwargs.items():
+            if hasattr(self.auto_mode.config, key):
+                setattr(self.auto_mode.config, key, value)
+                print(f"{BLUE}[CONFIG]{RESET} Set auto mode {key} = {value}")
+            else:
+                print(f"{RED}[ERROR]{RESET} Unknown auto mode configuration parameter: {key}")
+                
+    def get_auto_mode_config(self):
+        """Return the current auto mode configuration."""
+        return self.auto_mode.config
+        
+    def queue_auto_message(self, message: str):
+        """
+        Add a message to the auto-send queue.
+        
+        Args:
+            message: Message text to send
+        """
+        self.auto_mode.queue_message(message)
+        
+    def toggle_auto_mode_logging(self):
+        """
+        Toggle detailed logging for auto mode.
+        When enabled, will show more information about state transitions and decision making.
+        """
+        if not hasattr(self.auto_mode, 'verbose_logging'):
+            self.auto_mode.verbose_logging = True
+        else:
+            self.auto_mode.verbose_logging = not self.auto_mode.verbose_logging
+            
+        status = "enabled" if self.auto_mode.verbose_logging else "disabled"
+        print(f"{BLUE}[AUTO-LOG]{RESET} Detailed logging {status}")
+        
+    def debug_message(self, index: int):
+        """
+        Debug a message in the inbound message queue.
+        Prints detailed information about the message.
+        
+        Args:
+            index: The index of the message in the inbound_messages queue
+        """
+        if index < 0 or index >= len(self.inbound_messages):
+            print(f"{RED}[ERROR]{RESET} Invalid message index {index}")
+            return
+            
+        msg = self.inbound_messages[index]
+        print(f"\n{YELLOW}=== Message Debug [{index}] ==={RESET}")
+        print(f"Type: {msg['type']}")
+        print(f"Length: {len(msg['raw'])} bytes = {len(msg['raw'])*8} bits")
+        print(f"Raw data: {msg['raw'].hex()}")
+        
+        if msg['parsed'] is not None:
+            print(f"\n{YELLOW}--- Parsed Data ---{RESET}")
+            if msg['type'] == 'PING_REQUEST':
+                ping = msg['parsed']
+                print(f"Version: {ping.version}")
+                print(f"Cipher: {ping.cipher} ({'AES-256-GCM' if ping.cipher == 0 else 'ChaCha20-Poly1305' if ping.cipher == 1 else 'Unknown'})")
+                print(f"Session nonce: {ping.session_nonce.hex()}")
+                print(f"CRC32: {ping.crc32:08x}")
+                
+            elif msg['type'] == 'PING_RESPONSE':
+                resp = msg['parsed']
+                print(f"Version: {resp.version}")
+                print(f"Cipher: {resp.cipher} ({'AES-256-GCM' if resp.cipher == 0 else 'ChaCha20-Poly1305' if resp.cipher == 1 else 'Unknown'})")
+                print(f"Answer: {resp.answer} ({'Accept' if resp.answer == 1 else 'Reject'})")
+                print(f"CRC32: {resp.crc32:08x}")
+                
+            elif msg['type'] == 'HANDSHAKE':
+                hs = msg['parsed']
+                print(f"Ephemeral pubkey: {hs.ephemeral_pubkey.hex()[:16]}...")
+                print(f"Ephemeral signature: {hs.ephemeral_signature.hex()[:16]}...")
+                print(f"PFS hash: {hs.pfs_hash.hex()[:16]}...")
+                print(f"Timestamp: {hs.timestamp}")
+                print(f"CRC32: {hs.crc32:08x}")
+                
+            elif msg['type'] == 'ENCRYPTED_MESSAGE':
+                header = msg['parsed']
+                print(f"Flag: 0x{header.flag:04x}")
+                print(f"Data length: {header.data_len} bytes")
+                print(f"Retry: {header.retry}")
+                print(f"Connection status: {header.connection_status} ({'CRC included' if header.connection_status & 0x01 else 'No CRC'})")
+                print(f"IV: {header.iv.hex()}")
+                
+                # Calculate expected message size
+                expected_len = 18 + header.data_len + 16  # Header + payload + tag
+                if header.connection_status & 0x01:
+                    expected_len += 4  # Add CRC
+                    
+                print(f"Expected total length: {expected_len} bytes")
+                print(f"Actual length: {len(msg['raw'])} bytes")
+                
+                # If we have a key, try to decrypt
+                if self.hkdf_key:
+                    print("\nAttempting decryption...")
+                    try:
+                        key = bytes.fromhex(self.hkdf_key)
+                        plaintext = decrypt_message(msg['raw'], key, self.cipher_type)
+                        print(f"Decrypted: {plaintext.decode('utf-8')}")
+                    except Exception as e:
+                        print(f"Decryption failed: {e}")
+        print()
+
+    # -------------------------------------------------------------------------
+    # Public Methods
+    # -------------------------------------------------------------------------
+
+    def connect_to_peer(self, port: int):
+        conn = transmission.connect_to_peer("127.0.0.1", port, self.on_data_received)
+        self.connections.append(conn)
+        print(f"{GREEN}[IcingProtocol]{RESET} Outgoing connection to port {port} established.")
+        
+        # Notify auto mode
+        self.auto_mode.handle_connection_established()
+
+    def set_peer_identity(self, peer_pubkey_hex: str):
+        pubkey_bytes = bytes.fromhex(peer_pubkey_hex)
+        self.peer_identity_pubkey_obj = load_peer_identity_key(pubkey_bytes)
+        self.peer_identity_pubkey_bytes = pubkey_bytes
+        print(f"{GREEN}[IcingProtocol]{RESET} Stored peer identity pubkey (hex={peer_pubkey_hex[:16]}...).")
+
+    def generate_ephemeral_keys(self):
+        self.ephemeral_privkey, self.ephemeral_pubkey = get_ephemeral_keypair()
+        print(f"{GREEN}[IcingProtocol]{RESET} Generated ephemeral key pair: pubkey={self.ephemeral_pubkey.hex()[:16]}...")
+
+    # Send PING (session discovery and cipher negotiation)
+    def send_ping_request(self, cipher_type=0):
+        """
+        Send a ping request to the first connected peer.
+        
+        Args:
+            cipher_type: Preferred cipher type (0 = AES-256-GCM, 1 = ChaCha20-Poly1305)
+        """
+        if not self.connections:
+            print(f"{RED}[ERROR]{RESET} No active connections.")
+            return False
+        
+        # Validate cipher type
+        if cipher_type not in (0, 1):
+            print(f"{YELLOW}[WARNING]{RESET} Invalid cipher type {cipher_type}, defaulting to AES-256-GCM (0)")
+            cipher_type = 0
+            
+        # Create ping request with specified cipher
+        ping_request = PingRequest(version=0, cipher=cipher_type)
+        
+        # Store session nonce if not already set
+        if self.session_nonce is None:
+            self.session_nonce = ping_request.session_nonce
+            print(f"{YELLOW}[NOTICE]{RESET} Stored session nonce from sent PING.")
+            
+        # Serialize and send
+        pkt = ping_request.serialize()
+        self._send_packet(self.connections[0], pkt, "PING_REQUEST")
+        self.state["ping_sent"] = True
+        return True
+
+    def send_handshake(self):
+        """
+        Build and send handshake:
+          - ephemeral_pubkey (64 bytes, raw x||y)
+          - ephemeral_signature (64 bytes, raw r||s)
+          - pfs_hash (32 bytes)
+          - timestamp (32 bits)
+          - CRC (32 bits)
+        """
+        if not self.connections:
+            print(f"{RED}[ERROR]{RESET} No active connections.")
+            return False
+        if not self.ephemeral_privkey or not self.ephemeral_pubkey:
+            print(f"{RED}[ERROR]{RESET} Ephemeral keys not generated.")
+            return False
+        if self.peer_identity_pubkey_bytes is None:
+            print(f"{RED}[ERROR]{RESET} Peer identity not set; needed for PFS tracking.")
+            return False
+
+        # 1) Sign ephemeral_pubkey using identity key
+        sig_der = sign_data(self.identity_privkey, self.ephemeral_pubkey)
+        # Convert DER signature to raw r||s format (64 bytes)
+        raw_signature = der_to_raw(sig_der)
+
+        # 2) Compute PFS hash
+        session_number, last_secret_hex = self.pfs_history.get(self.peer_identity_pubkey_bytes, (-1, ""))
+        pfs = compute_pfs_hash(session_number, last_secret_hex)
+
+        # 3) Create handshake object
+        handshake = Handshake(
+            ephemeral_pubkey=self.ephemeral_pubkey,
+            ephemeral_signature=raw_signature,
+            pfs_hash=pfs
+        )
+
+        # 4) Serialize and send
+        pkt = handshake.serialize()
+        self._send_packet(self.connections[0], pkt, "HANDSHAKE")
+        self.state["handshake_sent"] = True
+        return True
+
+    def enable_auto_responder(self, enable: bool):
+        """
+        Legacy method for enabling/disabling auto responder.
+        For new code, use start_auto_mode() and stop_auto_mode() instead.
+        """
+        self.auto_responder = enable
+        print(f"{YELLOW}[LEGACY]{RESET} Auto responder set to {enable}. Consider using auto_mode instead.")
+
+    # -------------------------------------------------------------------------
+    # Manual Responses
+    # -------------------------------------------------------------------------
+
+    def respond_to_ping(self, index: int, answer: int):
+        """
+        Respond to a ping request with the specified answer (0 = no, 1 = yes).
+        If answer is 1, we accept the connection and use the cipher specified in the request.
+        """
+        if index < 0 or index >= len(self.inbound_messages):
+            print(f"{RED}[ERROR]{RESET} Invalid index {index}.")
+            return False
+        msg = self.inbound_messages[index]
+        if msg["type"] != "PING_REQUEST":
+            print(f"{RED}[ERROR]{RESET} inbound_messages[{index}] is not a PING_REQUEST.")
+            return False
+
+        ping_request = msg["parsed"]
+        version = ping_request.version
+        cipher = ping_request.cipher
+        
+        # Force cipher to 0 or 1 (only AES-256-GCM and ChaCha20-Poly1305 are supported)
+        if cipher != 0 and cipher != 1:
+            print(f"{YELLOW}[NOTICE]{RESET} Received PING with unsupported cipher ({cipher}); forcing cipher to 0 in response.")
+            cipher = 0
+            
+        # Store the negotiated cipher type if we're accepting
+        if answer == 1:
+            self.cipher_type = cipher
+
+        conn = msg["connection"]
+        # Create ping response
+        ping_response = PingResponse(version, cipher, answer)
+        resp = ping_response.serialize()
+        self._send_packet(conn, resp, "PING_RESPONSE")
+        print(f"{BLUE}[MANUAL]{RESET} Responded to ping with answer={answer}.")
+        return True
+
+    def generate_ecdhe(self, index: int):
+        """
+        Process a handshake message:
+        1. Verify the ephemeral signature
+        2. Compute the ECDH shared secret
+        3. Update PFS history
+        """
+        if index < 0 or index >= len(self.inbound_messages):
+            print(f"{RED}[ERROR]{RESET} Invalid index {index}.")
+            return False
+        msg = self.inbound_messages[index]
+        if msg["type"] != "HANDSHAKE":
+            print(f"{RED}[ERROR]{RESET} inbound_messages[{index}] is not a HANDSHAKE.")
+            return False
+
+        handshake = msg["parsed"]
+        
+        # Convert raw signature to DER for verification
+        raw_sig = handshake.ephemeral_signature
+        sig_der = raw_signature_to_der(raw_sig)
+
+        # Verify signature
+        ok = verify_signature(self.peer_identity_pubkey_obj, sig_der, handshake.ephemeral_pubkey)
+        if not ok:
+            print(f"{RED}[ERROR]{RESET} Ephemeral signature invalid.")
+            return False
+        print(f"{GREEN}[OK]{RESET} Ephemeral signature verified.")
+
+        # Check if we have ephemeral keys
+        if not self.ephemeral_privkey:
+            print(f"{YELLOW}[WARN]{RESET} No ephemeral_privkey available, cannot compute shared secret.")
+            return False
+            
+        # Compute ECDH shared secret
+        shared = compute_ecdh_shared_key(self.ephemeral_privkey, handshake.ephemeral_pubkey)
+        self.shared_secret = shared.hex()
+        print(f"{GREEN}[OK]{RESET} Computed ECDH shared key = {self.shared_secret}")
+
+        # Update PFS history
+        old_session, _ = self.pfs_history.get(self.peer_identity_pubkey_bytes, (-1, ""))
+        new_session = 1 if old_session < 0 else old_session + 1
+        self.pfs_history[self.peer_identity_pubkey_bytes] = (new_session, self.shared_secret)
+        return True
+
+    # -------------------------------------------------------------------------
+    # Utility
+    # -------------------------------------------------------------------------
+
+    def _send_packet(self, conn: transmission.PeerConnection, data: bytes, label: str):
+        bits_count = len(data) * 8
+        print(f"{BLUE}[SEND]{RESET} {label} -> {bits_count} bits: {data.hex()[:60]}{'...' if len(data.hex())>60 else ''}")
+        conn.send(data)
+
+    def show_state(self):
+        print(f"\n{YELLOW}=== Global State ==={RESET}")
+        print(f"Listening Port: {self.local_port}")
+        print(f"Identity PubKey: 512 bits => {self.identity_pubkey.hex()[:16]}...")
+
+        if self.peer_identity_pubkey_bytes:
+            print(f"Peer Identity PubKey: 512 bits => {self.peer_identity_pubkey_bytes.hex()[:16]}...")
+        else:
+            print("Peer Identity PubKey: [None]")
+
+        print("\nEphemeral Keys:")
+        if self.ephemeral_pubkey:
+            print(f"  ephemeral_pubkey: 512 bits => {self.ephemeral_pubkey.hex()[:16]}...")
+        else:
+            print("  ephemeral_pubkey: [None]")
+
+        print(f"\nShared Secret: {self.shared_secret if self.shared_secret else '[None]'}")
+
+        if self.hkdf_key:
+            print(f"HKDF Derived Key: {self.hkdf_key} (size: {len(self.hkdf_key)*8} bits)")
+        else:
+            print("HKDF Derived Key: [None]")
+            
+        print(f"Negotiated Cipher: {'AES-256-GCM' if self.cipher_type == 0 else 'ChaCha20-Poly1305'} (code: {self.cipher_type})")
+        
+        if self.session_nonce:
+            print(f"Session Nonce: {self.session_nonce.hex()} (129 bits)")
+        else:
+            print("Session Nonce: [None]")
+            
+        if self.last_iv:
+            print(f"Last IV: {self.last_iv.hex()} (96 bits)")
+        else:
+            print("Last IV: [None]")
+            
+        print("\nProtocol Flags:")
+        for k, v in self.state.items():
+            print(f"  {k}: {v}")
+
+        print("\nAuto Mode Active:", self.auto_mode.active)
+        print("Auto Mode State:", self.auto_mode.state)
+        print("Legacy Auto Responder:", self.auto_responder)
+
+        print("\nActive Connections:")
+        for i, c in enumerate(self.connections):
+            print(f"  [{i}] Alive={c.alive}")
+
+        print("\nInbound Message Queue:")
+        for i, m in enumerate(self.inbound_messages):
+            print(f"  [{i}] type={m['type']} len={len(m['raw'])} bytes => {len(m['raw']) * 8} bits")
+        print()
+
+    def stop(self):
+        """Stop the protocol and clean up resources."""
+        # Stop auto mode first
+        self.auto_mode.stop()
+        
+        # Stop server listener
+        self.server_listener.stop()
+        
+        # Close all connections
+        for c in self.connections:
+            c.close()
+        self.connections.clear()
+        self.inbound_messages.clear()
+        print(f"{RED}[STOP]{RESET} Protocol stopped.")
+
+    # -------------------------------------------------------------------------
+    # Encrypted Messaging
+    # -------------------------------------------------------------------------
+
+    def send_encrypted_message(self, plaintext: str):
+        """
+        Encrypts and sends a message using the derived HKDF key and negotiated cipher.
+        The message format is:
+        - Header (18 bytes): flag, data_len, retry, connection_status, IV
+        - Payload: variable length encrypted data
+        - Footer: Authentication tag (16 bytes) + optional CRC32 (4 bytes)
+        """
+        if not self.connections:
+            print(f"{RED}[ERROR]{RESET} No active connections.")
+            return False
+        if not self.hkdf_key:
+            print(f"{RED}[ERROR]{RESET} No HKDF key derived. Cannot encrypt message.")
+            return False
+            
+        # Get the encryption key
+        key = bytes.fromhex(self.hkdf_key)
+        
+        # Convert plaintext to bytes
+        plaintext_bytes = plaintext.encode('utf-8')
+        
+        # Generate or increment the IV
+        if self.last_iv is None:
+            # First message, generate random IV
+            iv = generate_iv(initial=True)
+        else:
+            # Subsequent message, increment previous IV
+            iv = generate_iv(initial=False, previous_iv=self.last_iv)
+            
+        # Store the new IV
+        self.last_iv = iv
+        
+        # Create encrypted message (connection_status 0 = no CRC)
+        encrypted = encrypt_message(
+            plaintext=plaintext_bytes,
+            key=key,
+            flag=0xBEEF,  # Default flag
+            retry=0,
+            connection_status=0,  # No CRC
+            iv=iv,
+            cipher_type=self.cipher_type
+        )
+        
+        # Send the encrypted message
+        self._send_packet(self.connections[0], encrypted, "ENCRYPTED_MESSAGE")
+        print(f"{GREEN}[SEND_ENCRYPTED]{RESET} Encrypted message sent.")
+        return True
+
+    def decrypt_received_message(self, index: int):
+        """
+        Decrypt a received encrypted message using the HKDF key and negotiated cipher.
+        """
+        if index < 0 or index >= len(self.inbound_messages):
+            print(f"{RED}[ERROR]{RESET} Invalid message index.")
+            return None
+            
+        msg = self.inbound_messages[index]
+        if msg["type"] != "ENCRYPTED_MESSAGE":
+            print(f"{RED}[ERROR]{RESET} Message at index {index} is not an ENCRYPTED_MESSAGE.")
+            return None
+            
+        # Get the encrypted message
+        encrypted = msg["raw"]
+        
+        if not self.hkdf_key:
+            print(f"{RED}[ERROR]{RESET} No HKDF key derived. Cannot decrypt message.")
+            return None
+            
+        # Get the encryption key
+        key = bytes.fromhex(self.hkdf_key)
+        
+        try:
+            # Decrypt the message
+            plaintext = decrypt_message(encrypted, key, self.cipher_type)
+            
+            # Convert to string
+            plaintext_str = plaintext.decode('utf-8')
+            
+            # Update last IV from the header
+            header = MessageHeader.unpack(encrypted[:18])
+            self.last_iv = header.iv
+            
+            print(f"{GREEN}[DECRYPTED]{RESET} Decrypted message: {plaintext_str}")
+            return plaintext_str
+        except Exception as e:
+            print(f"{RED}[ERROR]{RESET} Decryption failed: {e}")
+            return None

protocol_prototype/transmission.py

@@ -0,0 +1,100 @@
+import socket
+import threading
+from typing import Callable
+
+class PeerConnection:
+    """
+    Represents a live, two-way connection to a peer.
+    We keep a socket open, read data in a background thread,
+    and can send data from the main thread at any time.
+    """
+    def __init__(self, sock: socket.socket, on_data_received: Callable[['PeerConnection', bytes], None]):
+        self.sock = sock
+        self.on_data_received = on_data_received
+        self.alive = True
+
+        self.read_thread = threading.Thread(target=self.read_loop, daemon=True)
+        self.read_thread.start()
+
+    def read_loop(self):
+        while self.alive:
+            try:
+                data = self.sock.recv(4096)
+                if not data:
+                    break
+                self.on_data_received(self, data)
+            except OSError:
+                break
+        self.alive = False
+        self.sock.close()
+        print("[PeerConnection] Connection closed.")
+
+    def send(self, data: bytes):
+        if not self.alive:
+            print("[PeerConnection.send] Cannot send, connection not alive.")
+            return
+        try:
+            self.sock.sendall(data)
+        except OSError:
+            print("[PeerConnection.send] Send failed, connection might be closed.")
+            self.alive = False
+
+    def close(self):
+        self.alive = False
+        try:
+            self.sock.shutdown(socket.SHUT_RDWR)
+        except OSError:
+            pass
+        self.sock.close()
+
+
+class ServerListener(threading.Thread):
+    """
+    A thread that listens on a given port. When a new client connects,
+    it creates a PeerConnection for that client.
+    """
+    def __init__(self, host: str, port: int,
+                 on_new_connection: Callable[[PeerConnection], None],
+                 on_data_received: Callable[[PeerConnection, bytes], None]):
+        super().__init__(daemon=True)
+        self.host = host
+        self.port = port
+        self.on_new_connection = on_new_connection
+        self.on_data_received = on_data_received
+        self.server_socket = None
+        self.stop_event = threading.Event()
+
+    def run(self):
+        self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.server_socket.bind((self.host, self.port))
+        self.server_socket.listen(5)
+        self.server_socket.settimeout(1.0)
+        print(f"[ServerListener] Listening on {self.host}:{self.port}")
+
+        while not self.stop_event.is_set():
+            try:
+                client_sock, addr = self.server_socket.accept()
+                print(f"[ServerListener] Accepted connection from {addr}")
+                conn = PeerConnection(client_sock, self.on_data_received)
+                self.on_new_connection(conn)
+            except socket.timeout:
+                pass
+            except OSError:
+                break
+
+        if self.server_socket:
+            self.server_socket.close()
+
+    def stop(self):
+        self.stop_event.set()
+        if self.server_socket:
+            self.server_socket.close()
+
+
+def connect_to_peer(host: str, port: int,
+                    on_data_received: Callable[[PeerConnection, bytes], None]) -> PeerConnection:
+    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    sock.connect((host, port))
+    print(f"[connect_to_peer] Connected to {host}:{port}")
+    conn = PeerConnection(sock, on_data_received)
+    return conn