+ if(!strncmp(key, "ECDH:", 5)) {
+ logger(LOG_DEBUG, "Got ECDH key from %s", from->name);
+
+ keylen = (strlen(key) - 5) / 2;
+
+ if(keylen != ECDH_SIZE) {
+ logger(LOG_ERR, "Node %s (%s) uses wrong keylength!", from->name, from->hostname);
+ return false;
+ }
+
+ if(ECDH_SHARED_SIZE < cipher_keylength(&from->outcipher)) {
+ logger(LOG_ERR, "ECDH key too short for cipher of %s!", from->name);
+ return false;
+ }
+
+ if(!from->ecdh) {
+ logger(LOG_DEBUG, "Woops, we didn't generate our public key yet");
+ from->status.ecdh = true;
+ if(!send_ans_key(from))
+ return false;
+ }
+
+ char shared[ECDH_SHARED_SIZE * 2 + 1];
+ char hex[ECDH_SHARED_SIZE * 2 + 1];
+ hex2bin(key + 5, key + 5, keylen);
+
+ if(!ecdh_compute_shared(&from->ecdh, key + 5, shared))
+ return false;
+
+ /* Update our crypto end */
+
+ char *mykey;
+ size_t mykeylen = cipher_keylength(&myself->incipher);
+ keylen = cipher_keylength(&from->outcipher);
+
+ if(ECDH_SHARED_SIZE < mykeylen) {
+ logger(LOG_ERR, "ECDH key too short for cipher of MYSELF!");
+ return false;
+ }
+
+ if(strcmp(myself->name, from->name) < 0) {
+ logger(LOG_DEBUG, "Using left half of shared secret");
+ mykey = shared;
+ memcpy(key, shared + ECDH_SHARED_SIZE - keylen, keylen);
+ } else {
+ logger(LOG_DEBUG, "Using right half of shared secret");
+ mykey = shared + ECDH_SHARED_SIZE - mykeylen;
+ memcpy(key, shared, keylen);
+ }
+
+ cipher_open_by_nid(&from->incipher, cipher_get_nid(&myself->incipher));
+ digest_open_by_nid(&from->indigest, digest_get_nid(&myself->indigest), digest_length(&myself->indigest));
+ from->incompression = myself->incompression;
+
+ cipher_set_key(&from->incipher, mykey, true);
+ digest_set_key(&from->indigest, mykey, mykeylen);
+
+ // Reset sequence number and late packet window
+ mykeyused = true;
+ from->received_seqno = 0;
+ if(replaywin)
+ memset(from->late, 0, replaywin);
+
+ bin2hex(shared, hex, ECDH_SHARED_SIZE);
+ hex[ECDH_SHARED_SIZE * 2] = 0;
+ logger(LOG_DEBUG, "Shared secret was %s", hex);
+
+ bin2hex(mykey, hex, mykeylen);
+ hex[mykeylen * 2] = 0;
+ logger(LOG_DEBUG, "My part is: %s (%d)", hex, mykeylen);
+
+ bin2hex(key, hex, keylen);
+ hex[keylen * 2] = 0;
+ logger(LOG_DEBUG, "His part is: %s (%d)", hex, keylen);
+ } else {
+ keylen = strlen(key) / 2;
+ hex2bin(key, key, keylen);
+ }