- char *buffer;
- int keylength;
- int x;
-cp
- if(cl->chal_hash)
- free(cl->chal_hash);
-
- /* Allocate buffers for the challenge and the hash */
-
- cl->chal_hash = xmalloc(SHA_DIGEST_LEN);
- keylength = BN_num_bytes(cl->rsakey.n);
- buffer = xmalloc(keylength*2);
-
- /* Copy random data and the public key to the buffer */
-
- RAND_bytes(buffer, keylength);
- BN_bn2bin(cl->rsakey.n, 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.encrypted)
- {
- set_metakey(cl, buffer, keylength);
- }
-
- /* Calculate the hash from that */
-
- SHA1(buffer, keylength*2, cl->chal_hash);
-
- /* 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.encrypted = 1;
-cp
- return x;
-}
-
-int challenge_h(conn_list_t *cl)
-{
- char *challenge;
-cp
- if(sscanf(cl->buffer, "%*d %as", &cl->id, &challenge) != 1)
- {
- syslog(LOG_ERR, _("Got bad CHALLENGE from %s (%s)"), cl->id, cl->hostname);
- return -1;
- }
-
- /* Rest is done by send_chal_reply() */
-
- x = send_chal_reply(cl, challenge);
- free(challenge);
-cp
- return x;
-}
-
-int send_chal_reply(conn_list_t *cl, char *challenge)
-{
- char *buffer;
- int keylength;
- char *hash;
- int x;
-cp
- keylength = BN_num_bytes(myself->rsakey.n);
-
- /* Check if the length of the challenge is all right */
-
- if(strlen(challenge) != keylength*2)
- {
- syslog(LOG_ERROR, _("Intruder: wrong challenge length from %s (%s)"), cl->id, cl->hostname);
- return -1;
- }
-
- /* Allocate buffers for the challenge and the hash */
-
- buffer = xmalloc(keylength*2);
- hash = xmalloc(SHA_DIGEST_LEN*2+1);
-
- /* Copy the incoming random data and our public key to the buffer */
-
- hex2bin(challenge, buffer, keylength);
- BN_bn2bin(myself->rsakey.n, buffer+keylength);