Try to decrypt 'client-auth' first, then fall back to 'client-hello'

Author: lgrahl

saltyrtc/server/message.py

@@ -225,19 +225,19 @@ def unpack(cls, client, data):
             if not client.authenticated and client.type is None:
                 payload = None
 
-                # Try client-hello (unencrypted)
+                # Try client-auth (encrypted)
                 try:
-                    payload = cls._unpack_payload(data)
+                    payload = cls._unpack_payload(
+                        cls._decrypt_payload(client, nonce, data))
                 except MessageError:
                     pass
 
-                # Try client-auth (encrypted)
+                # Try client-hello (unencrypted)
                 if payload is None:
                     try:
-                        payload = cls._unpack_payload(
-                            cls._decrypt_payload(client, nonce, data))
+                        payload = cls._unpack_payload(data)
                     except MessageError:
-                        pass
+                        payload = None
 
                 # Still no payload?
                 if payload is None: