summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2014-06-09 13:54:01 +0000
committerjsing <>2014-06-09 13:54:01 +0000
commit6bda545cea89cef2781158d0428b7894fd12f284 (patch)
tree482f0424f2d394964f431faa1e5cd100b47e0610 /src
parent2271f442f92448c70fcbc2fe027e58706b44a010 (diff)
downloadopenbsd-6bda545cea89cef2781158d0428b7894fd12f284.tar.gz
openbsd-6bda545cea89cef2781158d0428b7894fd12f284.tar.bz2
openbsd-6bda545cea89cef2781158d0428b7894fd12f284.zip
More KNF.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/src/ssl/s3_enc.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/libssl/src/ssl/s3_enc.c b/src/lib/libssl/src/ssl/s3_enc.c
index 57f9c133cc..8a1758f8b7 100644
--- a/src/lib/libssl/src/ssl/s3_enc.c
+++ b/src/lib/libssl/src/ssl/s3_enc.c
@@ -178,7 +178,8 @@ ssl3_generate_key_block(SSL *s, unsigned char *km, int num)
178 k++; 178 k++;
179 if (k > sizeof buf) { 179 if (k > sizeof buf) {
180 /* bug: 'buf' is too small for this ciphersuite */ 180 /* bug: 'buf' is too small for this ciphersuite */
181 SSLerr(SSL_F_SSL3_GENERATE_KEY_BLOCK, ERR_R_INTERNAL_ERROR); 181 SSLerr(SSL_F_SSL3_GENERATE_KEY_BLOCK,
182 ERR_R_INTERNAL_ERROR);
182 return 0; 183 return 0;
183 } 184 }
184 185
@@ -645,10 +646,10 @@ ssl3_handshake_mac(SSL *s, int md_nid, const char *sender, int len,
645 if (!ssl3_digest_cached_records(s)) 646 if (!ssl3_digest_cached_records(s))
646 return 0; 647 return 0;
647 648
648 /* Search for digest of specified type in the handshake_dgst 649 /* Search for digest of specified type in the handshake_dgst array. */
649 * array*/
650 for (i = 0; i < SSL_MAX_DIGEST; i++) { 650 for (i = 0; i < SSL_MAX_DIGEST; i++) {
651 if (s->s3->handshake_dgst[i]&&EVP_MD_CTX_type(s->s3->handshake_dgst[i]) == md_nid) { 651 if (s->s3->handshake_dgst[i] &&
652 EVP_MD_CTX_type(s->s3->handshake_dgst[i]) == md_nid) {
652 d = s->s3->handshake_dgst[i]; 653 d = s->s3->handshake_dgst[i];
653 break; 654 break;
654 } 655 }
@@ -664,7 +665,7 @@ ssl3_handshake_mac(SSL *s, int md_nid, const char *sender, int len,
664 if (n < 0) 665 if (n < 0)
665 return 0; 666 return 0;
666 667
667 npad = (48/n)*n; 668 npad = (48 / n) * n;
668 if (sender != NULL) 669 if (sender != NULL)
669 EVP_DigestUpdate(&ctx, sender, len); 670 EVP_DigestUpdate(&ctx, sender, len);
670 EVP_DigestUpdate(&ctx, s->session->master_key, 671 EVP_DigestUpdate(&ctx, s->session->master_key,
@@ -712,7 +713,7 @@ n_ssl3_mac(SSL *ssl, unsigned char *md, int send)
712 if (t < 0) 713 if (t < 0)
713 return -1; 714 return -1;
714 md_size = t; 715 md_size = t;
715 npad = (48/md_size)*md_size; 716 npad = (48 / md_size) * md_size;
716 717
717 /* kludge: ssl3_cbc_remove_padding passes padding length in rec->type */ 718 /* kludge: ssl3_cbc_remove_padding passes padding length in rec->type */
718 orig_len = rec->length + md_size + ((unsigned int)rec->type >> 8); 719 orig_len = rec->length + md_size + ((unsigned int)rec->type >> 8);
@@ -752,7 +753,7 @@ n_ssl3_mac(SSL *ssl, unsigned char *md, int send)
752 /* Chop the digest off the end :-) */ 753 /* Chop the digest off the end :-) */
753 EVP_MD_CTX_init(&md_ctx); 754 EVP_MD_CTX_init(&md_ctx);
754 755
755 EVP_MD_CTX_copy_ex( &md_ctx, hash); 756 EVP_MD_CTX_copy_ex(&md_ctx, hash);
756 EVP_DigestUpdate(&md_ctx, mac_sec, md_size); 757 EVP_DigestUpdate(&md_ctx, mac_sec, md_size);
757 EVP_DigestUpdate(&md_ctx, ssl3_pad_1, npad); 758 EVP_DigestUpdate(&md_ctx, ssl3_pad_1, npad);
758 EVP_DigestUpdate(&md_ctx, seq, 8); 759 EVP_DigestUpdate(&md_ctx, seq, 8);
@@ -762,13 +763,13 @@ n_ssl3_mac(SSL *ssl, unsigned char *md, int send)
762 s2n(rec->length, p); 763 s2n(rec->length, p);
763 EVP_DigestUpdate(&md_ctx, md, 2); 764 EVP_DigestUpdate(&md_ctx, md, 2);
764 EVP_DigestUpdate(&md_ctx, rec->input, rec->length); 765 EVP_DigestUpdate(&md_ctx, rec->input, rec->length);
765 EVP_DigestFinal_ex( &md_ctx, md, NULL); 766 EVP_DigestFinal_ex(&md_ctx, md, NULL);
766 767
767 EVP_MD_CTX_copy_ex( &md_ctx, hash); 768 EVP_MD_CTX_copy_ex(&md_ctx, hash);
768 EVP_DigestUpdate(&md_ctx, mac_sec, md_size); 769 EVP_DigestUpdate(&md_ctx, mac_sec, md_size);
769 EVP_DigestUpdate(&md_ctx, ssl3_pad_2, npad); 770 EVP_DigestUpdate(&md_ctx, ssl3_pad_2, npad);
770 EVP_DigestUpdate(&md_ctx, md, md_size); 771 EVP_DigestUpdate(&md_ctx, md, md_size);
771 EVP_DigestFinal_ex( &md_ctx, md, &md_size_u); 772 EVP_DigestFinal_ex(&md_ctx, md, &md_size_u);
772 md_size = md_size_u; 773 md_size = md_size_u;
773 774
774 EVP_MD_CTX_cleanup(&md_ctx); 775 EVP_MD_CTX_cleanup(&md_ctx);
@@ -787,7 +788,6 @@ ssl3_record_sequence_update(unsigned char *seq)
787 ++seq[i]; 788 ++seq[i];
788 if (seq[i] != 0) 789 if (seq[i] != 0)
789 break; 790 break;
790
791 } 791 }
792} 792}
793 793