- if((cl->options = str2opt(options)) == -1)
- {
- syslog(LOG_ERR, _("Peer %s uses invalid option string"), cl->hostname);
- return -1;
- }
-
- /* Check if identity is a valid name */
-
- if(!check_id(cl->name))
- {
- syslog(LOG_ERR, _("Peer %s uses invalid identity name"), cl->hostname);
- return -1;
- }
-
- /* Load information about peer */
-
- if(!read_id(cl))
- {
- syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), cl->hostname, cl->name);
- return -1;
- }
-
-
- /* First check if the host we connected to is already in our
- connection list. If so, we are probably making a loop, which
- is not desirable.
- */
-
- if(cl->status.outgoing)
- {
- if((old = lookup_id(cl->name)))
- {
- if(debug_lvl > DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Uplink %s (%s) is already in our connection list"), cl->name, cl->hostname);
- cl->status.outgoing = 0;
- old->status.outgoing = 1;
- terminate_connection(cl);
- return 0;
- }
- }
-
- /* Send a challenge to verify the identity */
-
- cl->allow_request = CHAL_REPLY;
-cp
- return send_challenge(cl);
-}
-
-int send_challenge(conn_list_t *cl)
-{
- char *buffer;
- int keylength;
- int x;
-cp
- if(cl->chal_answer)
- free(cl->chal_answer);
-
- /* Allocate buffers for the challenge and the hash */
-
- cl->chal_answer = xmalloc(SHA_DIGEST_LENGTH);
- keylength = BN_num_bytes(cl->rsakey->length);
- buffer = xmalloc(keylength*2);
-
- /* Copy random data and the public key to the buffer */
-
- RAND_bytes(buffer, keylength);
- BN_bn2bin(cl->rsakey->length, buffer+keylength);
-
- /* If we don't have a blowfish key set yet, use the random data from the challenge to do so. */
-
- if(!cl->status.encryptin)
- {
- set_metakey(cl, buffer, keylength);
- }
-
- /* Calculate the hash from that */
-
- SHA1(buffer, keylength*2, cl->chal_answer);
-
- /* Convert the random data to a hexadecimal formatted string */
-
- bin2hex(buffer,buffer,keylength);
- buffer[keylength*2] = '\0';
-
- /* Send the challenge */
-
- cl->allow_request = CHAL_REPLY;
- x = send_request(cl, "%d %s", CHALLENGE, buffer);
- free(buffer);
- cl->status.encryptout = 1;
-cp
- return x;