TLS/SSL and crypto library
Revision | 323d39e87f86bc4524881942aafc7539532aefff (tree) |
---|---|
Time | 2015-01-22 18:31:48 |
Author | Matt Caswell <matt@open...> |
Commiter | Matt Caswell |
Rerun util/openssl-format-source -v -c .
Reviewed-by: Tim Hudson <tjh@openssl.org>
@@ -344,7 +344,9 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_REVOKED) | ||
344 | 344 | IMPLEMENT_ASN1_DUP_FUNCTION(X509_REVOKED) |
345 | 345 | |
346 | 346 | IMPLEMENT_ASN1_FUNCTIONS(X509_CRL_INFO) |
347 | + | |
347 | 348 | IMPLEMENT_ASN1_FUNCTIONS(X509_CRL) |
349 | + | |
348 | 350 | IMPLEMENT_ASN1_DUP_FUNCTION(X509_CRL) |
349 | 351 | |
350 | 352 | static int X509_REVOKED_cmp(const X509_REVOKED *const *a, |
@@ -511,4 +513,5 @@ IMPLEMENT_STACK_OF(X509_REVOKED) | ||
511 | 513 | IMPLEMENT_ASN1_SET_OF(X509_REVOKED) |
512 | 514 | |
513 | 515 | IMPLEMENT_STACK_OF(X509_CRL) |
516 | + | |
514 | 517 | IMPLEMENT_ASN1_SET_OF(X509_CRL) |
@@ -239,8 +239,7 @@ static int MS_CALLBACK file_read(BIO *b, char *out, int outl) | ||
239 | 239 | else |
240 | 240 | ret = fread(out, 1, (int)outl, (FILE *)b->ptr); |
241 | 241 | if (ret == 0 |
242 | - && (b-> | |
243 | - flags & BIO_FLAGS_UPLINK) ? UP_ferror((FILE *)b->ptr) : | |
242 | + && (b->flags & BIO_FLAGS_UPLINK) ? UP_ferror((FILE *)b->ptr) : | |
244 | 243 | ferror((FILE *)b->ptr)) { |
245 | 244 | SYSerr(SYS_F_FREAD, get_last_sys_error()); |
246 | 245 | BIOerr(BIO_F_FILE_READ, ERR_R_SYS_LIB); |
@@ -1299,9 +1299,8 @@ int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, | ||
1299 | 1299 | |
1300 | 1300 | for (i = 1; i < num; i++) { |
1301 | 1301 | if (!BN_is_zero(&points[i]->Z)) { |
1302 | - if (!group-> | |
1303 | - meth->field_mul(group, prod_Z[i], prod_Z[i - 1], | |
1304 | - &points[i]->Z, ctx)) | |
1302 | + if (!group->meth->field_mul(group, prod_Z[i], prod_Z[i - 1], | |
1303 | + &points[i]->Z, ctx)) | |
1305 | 1304 | goto err; |
1306 | 1305 | } else { |
1307 | 1306 | if (!BN_copy(prod_Z[i], prod_Z[i - 1])) |
@@ -842,9 +842,8 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) | ||
842 | 842 | goto err; |
843 | 843 | |
844 | 844 | if (rsa->e && rsa->n) { |
845 | - if (!rsa-> | |
846 | - meth->bn_mod_exp(vrfy, r0, rsa->e, rsa->n, ctx, | |
847 | - rsa->_method_mod_n)) | |
845 | + if (!rsa->meth->bn_mod_exp(vrfy, r0, rsa->e, rsa->n, ctx, | |
846 | + rsa->_method_mod_n)) | |
848 | 847 | goto err; |
849 | 848 | /* |
850 | 849 | * If 'I' was greater than (or equal to) rsa->n, the operation will |
@@ -587,7 +587,9 @@ pushfd cld mov esi, ecx mov edi, ecx mov ecx, 60 up:lodsd | ||
587 | 587 | # if defined(NID_aes_256_ofb128) && ! defined (NID_aes_256_ofb) |
588 | 588 | # define NID_aes_256_ofb NID_aes_256_ofb128 |
589 | 589 | # endif |
590 | -/* List of supported ciphers. */ static int padlock_cipher_nids[] = { | |
590 | +/* | |
591 | + * List of supported ciphers. | |
592 | + */ static int padlock_cipher_nids[] = { | |
591 | 593 | NID_aes_128_ecb, |
592 | 594 | NID_aes_128_cbc, |
593 | 595 | NID_aes_128_cfb, |
@@ -491,8 +491,7 @@ int dtls1_accept(SSL *s) | ||
491 | 491 | || ((alg_k & SSL_kRSA) |
492 | 492 | && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL |
493 | 493 | || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) |
494 | - && EVP_PKEY_size(s->cert-> | |
495 | - pkeys | |
494 | + && EVP_PKEY_size(s->cert->pkeys | |
496 | 495 | [SSL_PKEY_RSA_ENC].privatekey) * |
497 | 496 | 8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher) |
498 | 497 | ) |
@@ -484,8 +484,7 @@ static int get_client_master_key(SSL *s) | ||
484 | 484 | if ((i < 0) || ((!is_export && (i != EVP_CIPHER_key_length(c))) |
485 | 485 | || (is_export && ((i != ek) |
486 | 486 | || (s->s2->tmp.clear + |
487 | - (unsigned int)i != | |
488 | - (unsigned int) | |
487 | + (unsigned int)i != (unsigned int) | |
489 | 488 | EVP_CIPHER_key_length(c)))))) { |
490 | 489 | ERR_clear_error(); |
491 | 490 | if (is_export) |
@@ -684,8 +684,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len) | ||
684 | 684 | len >= 4 * (int)(max_send_fragment = s->max_send_fragment) && |
685 | 685 | s->compress == NULL && s->msg_callback == NULL && |
686 | 686 | SSL_USE_EXPLICIT_IV(s) && |
687 | - EVP_CIPHER_flags(s-> | |
688 | - enc_write_ctx->cipher) & | |
687 | + EVP_CIPHER_flags(s->enc_write_ctx->cipher) & | |
689 | 688 | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK) { |
690 | 689 | unsigned char aad[13]; |
691 | 690 | EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM mb_param; |
@@ -475,8 +475,7 @@ int ssl3_accept(SSL *s) | ||
475 | 475 | || ((alg_k & SSL_kRSA) |
476 | 476 | && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL |
477 | 477 | || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) |
478 | - && EVP_PKEY_size(s->cert-> | |
479 | - pkeys | |
478 | + && EVP_PKEY_size(s->cert->pkeys | |
480 | 479 | [SSL_PKEY_RSA_ENC].privatekey) * |
481 | 480 | 8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher) |
482 | 481 | ) |
@@ -476,8 +476,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, | ||
476 | 476 | |
477 | 477 | if (try_session_cache && |
478 | 478 | ret == NULL && |
479 | - !(s-> | |
480 | - session_ctx->session_cache_mode & | |
479 | + !(s->session_ctx->session_cache_mode & | |
481 | 480 | SSL_SESS_CACHE_NO_INTERNAL_LOOKUP)) { |
482 | 481 | SSL_SESSION data; |
483 | 482 | data.ssl_version = s->version; |
@@ -518,8 +517,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, | ||
518 | 517 | * well if and only if we are supposed to. |
519 | 518 | */ |
520 | 519 | if (! |
521 | - (s-> | |
522 | - session_ctx->session_cache_mode & | |
520 | + (s->session_ctx->session_cache_mode & | |
523 | 521 | SSL_SESS_CACHE_NO_INTERNAL_STORE)) |
524 | 522 | /* |
525 | 523 | * The following should not return 1, otherwise, things are |