Mercurial > dropbear
comparison common-kex.c @ 594:a98a2138364a
Improve capitalisation for all logged strings
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Wed, 23 Feb 2011 15:50:30 +0000 |
parents | f9b5dc0cba61 |
children | 2895626d864f |
comparison
equal
deleted
inserted
replaced
593:ea103e4476ce | 594:a98a2138364a |
---|---|
301 hashkeys(C2S_key, C2S_keysize, &hs, 'C'); | 301 hashkeys(C2S_key, C2S_keysize, &hs, 'C'); |
302 hashkeys(S2C_key, S2C_keysize, &hs, 'D'); | 302 hashkeys(S2C_key, S2C_keysize, &hs, 'D'); |
303 | 303 |
304 recv_cipher = find_cipher(ses.newkeys->recv.algo_crypt->cipherdesc->name); | 304 recv_cipher = find_cipher(ses.newkeys->recv.algo_crypt->cipherdesc->name); |
305 if (recv_cipher < 0) | 305 if (recv_cipher < 0) |
306 dropbear_exit("crypto error"); | 306 dropbear_exit("Crypto error"); |
307 if (ses.newkeys->recv.crypt_mode->start(recv_cipher, | 307 if (ses.newkeys->recv.crypt_mode->start(recv_cipher, |
308 recv_IV, recv_key, | 308 recv_IV, recv_key, |
309 ses.newkeys->recv.algo_crypt->keysize, 0, | 309 ses.newkeys->recv.algo_crypt->keysize, 0, |
310 &ses.newkeys->recv.cipher_state) != CRYPT_OK) { | 310 &ses.newkeys->recv.cipher_state) != CRYPT_OK) { |
311 dropbear_exit("crypto error"); | 311 dropbear_exit("Crypto error"); |
312 } | 312 } |
313 | 313 |
314 trans_cipher = find_cipher(ses.newkeys->trans.algo_crypt->cipherdesc->name); | 314 trans_cipher = find_cipher(ses.newkeys->trans.algo_crypt->cipherdesc->name); |
315 if (trans_cipher < 0) | 315 if (trans_cipher < 0) |
316 dropbear_exit("crypto error"); | 316 dropbear_exit("Crypto error"); |
317 if (ses.newkeys->trans.crypt_mode->start(trans_cipher, | 317 if (ses.newkeys->trans.crypt_mode->start(trans_cipher, |
318 trans_IV, trans_key, | 318 trans_IV, trans_key, |
319 ses.newkeys->trans.algo_crypt->keysize, 0, | 319 ses.newkeys->trans.algo_crypt->keysize, 0, |
320 &ses.newkeys->trans.cipher_state) != CRYPT_OK) { | 320 &ses.newkeys->trans.cipher_state) != CRYPT_OK) { |
321 dropbear_exit("crypto error"); | 321 dropbear_exit("Crypto error"); |
322 } | 322 } |
323 | 323 |
324 /* MAC keys */ | 324 /* MAC keys */ |
325 hashkeys(ses.newkeys->trans.mackey, | 325 hashkeys(ses.newkeys->trans.mackey, |
326 ses.newkeys->trans.algo_mac->keysize, &hs, mactransletter); | 326 ses.newkeys->trans.algo_mac->keysize, &hs, mactransletter); |
392 | 392 |
393 /* clean up old keys */ | 393 /* clean up old keys */ |
394 if (ses.keys->recv.zstream != NULL) { | 394 if (ses.keys->recv.zstream != NULL) { |
395 if (inflateEnd(ses.keys->recv.zstream) == Z_STREAM_ERROR) { | 395 if (inflateEnd(ses.keys->recv.zstream) == Z_STREAM_ERROR) { |
396 /* Z_DATA_ERROR is ok, just means that stream isn't ended */ | 396 /* Z_DATA_ERROR is ok, just means that stream isn't ended */ |
397 dropbear_exit("crypto error"); | 397 dropbear_exit("Crypto error"); |
398 } | 398 } |
399 m_free(ses.keys->recv.zstream); | 399 m_free(ses.keys->recv.zstream); |
400 } | 400 } |
401 if (ses.keys->trans.zstream != NULL) { | 401 if (ses.keys->trans.zstream != NULL) { |
402 if (deflateEnd(ses.keys->trans.zstream) == Z_STREAM_ERROR) { | 402 if (deflateEnd(ses.keys->trans.zstream) == Z_STREAM_ERROR) { |
403 /* Z_DATA_ERROR is ok, just means that stream isn't ended */ | 403 /* Z_DATA_ERROR is ok, just means that stream isn't ended */ |
404 dropbear_exit("crypto error"); | 404 dropbear_exit("Crypto error"); |
405 } | 405 } |
406 m_free(ses.keys->trans.zstream); | 406 m_free(ses.keys->trans.zstream); |
407 } | 407 } |
408 } | 408 } |
409 #endif /* DISABLE_ZLIB */ | 409 #endif /* DISABLE_ZLIB */ |
746 /* reserved for future extensions */ | 746 /* reserved for future extensions */ |
747 buf_getint(ses.payload); | 747 buf_getint(ses.payload); |
748 return; | 748 return; |
749 | 749 |
750 error: | 750 error: |
751 dropbear_exit("no matching algo %s", erralgo); | 751 dropbear_exit("No matching algo %s", erralgo); |
752 } | 752 } |