• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

TLS/SSL and crypto library


Commit MetaInfo

Revision323d39e87f86bc4524881942aafc7539532aefff (tree)
Time2015-01-22 18:31:48
AuthorMatt Caswell <matt@open...>
CommiterMatt Caswell

Log Message

Rerun util/openssl-format-source -v -c .

Reviewed-by: Tim Hudson <tjh@openssl.org>

Change Summary

Incremental Difference

--- a/crypto/asn1/x_crl.c
+++ b/crypto/asn1/x_crl.c
@@ -344,7 +344,9 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_REVOKED)
344344 IMPLEMENT_ASN1_DUP_FUNCTION(X509_REVOKED)
345345
346346 IMPLEMENT_ASN1_FUNCTIONS(X509_CRL_INFO)
347+
347348 IMPLEMENT_ASN1_FUNCTIONS(X509_CRL)
349+
348350 IMPLEMENT_ASN1_DUP_FUNCTION(X509_CRL)
349351
350352 static int X509_REVOKED_cmp(const X509_REVOKED *const *a,
@@ -511,4 +513,5 @@ IMPLEMENT_STACK_OF(X509_REVOKED)
511513 IMPLEMENT_ASN1_SET_OF(X509_REVOKED)
512514
513515 IMPLEMENT_STACK_OF(X509_CRL)
516+
514517 IMPLEMENT_ASN1_SET_OF(X509_CRL)
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -239,8 +239,7 @@ static int MS_CALLBACK file_read(BIO *b, char *out, int outl)
239239 else
240240 ret = fread(out, 1, (int)outl, (FILE *)b->ptr);
241241 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) :
244243 ferror((FILE *)b->ptr)) {
245244 SYSerr(SYS_F_FREAD, get_last_sys_error());
246245 BIOerr(BIO_F_FILE_READ, ERR_R_SYS_LIB);
--- a/crypto/ec/ecp_smpl.c
+++ b/crypto/ec/ecp_smpl.c
@@ -1299,9 +1299,8 @@ int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num,
12991299
13001300 for (i = 1; i < num; i++) {
13011301 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))
13051304 goto err;
13061305 } else {
13071306 if (!BN_copy(prod_Z[i], prod_Z[i - 1]))
--- a/crypto/rsa/rsa_eay.c
+++ b/crypto/rsa/rsa_eay.c
@@ -842,9 +842,8 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
842842 goto err;
843843
844844 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))
848847 goto err;
849848 /*
850849 * If 'I' was greater than (or equal to) rsa->n, the operation will
--- a/engines/e_padlock.c
+++ b/engines/e_padlock.c
@@ -587,7 +587,9 @@ pushfd cld mov esi, ecx mov edi, ecx mov ecx, 60 up:lodsd
587587 # if defined(NID_aes_256_ofb128) && ! defined (NID_aes_256_ofb)
588588 # define NID_aes_256_ofb NID_aes_256_ofb128
589589 # endif
590-/* List of supported ciphers. */ static int padlock_cipher_nids[] = {
590+/*
591+ * List of supported ciphers.
592+ */ static int padlock_cipher_nids[] = {
591593 NID_aes_128_ecb,
592594 NID_aes_128_cbc,
593595 NID_aes_128_cfb,
--- a/ssl/d1_srvr.c
+++ b/ssl/d1_srvr.c
@@ -491,8 +491,7 @@ int dtls1_accept(SSL *s)
491491 || ((alg_k & SSL_kRSA)
492492 && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL
493493 || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher)
494- && EVP_PKEY_size(s->cert->
495- pkeys
494+ && EVP_PKEY_size(s->cert->pkeys
496495 [SSL_PKEY_RSA_ENC].privatekey) *
497496 8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)
498497 )
--- a/ssl/s2_srvr.c
+++ b/ssl/s2_srvr.c
@@ -484,8 +484,7 @@ static int get_client_master_key(SSL *s)
484484 if ((i < 0) || ((!is_export && (i != EVP_CIPHER_key_length(c)))
485485 || (is_export && ((i != ek)
486486 || (s->s2->tmp.clear +
487- (unsigned int)i !=
488- (unsigned int)
487+ (unsigned int)i != (unsigned int)
489488 EVP_CIPHER_key_length(c)))))) {
490489 ERR_clear_error();
491490 if (is_export)
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -684,8 +684,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
684684 len >= 4 * (int)(max_send_fragment = s->max_send_fragment) &&
685685 s->compress == NULL && s->msg_callback == NULL &&
686686 SSL_USE_EXPLICIT_IV(s) &&
687- EVP_CIPHER_flags(s->
688- enc_write_ctx->cipher) &
687+ EVP_CIPHER_flags(s->enc_write_ctx->cipher) &
689688 EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK) {
690689 unsigned char aad[13];
691690 EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM mb_param;
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -475,8 +475,7 @@ int ssl3_accept(SSL *s)
475475 || ((alg_k & SSL_kRSA)
476476 && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL
477477 || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher)
478- && EVP_PKEY_size(s->cert->
479- pkeys
478+ && EVP_PKEY_size(s->cert->pkeys
480479 [SSL_PKEY_RSA_ENC].privatekey) *
481480 8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)
482481 )
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -476,8 +476,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
476476
477477 if (try_session_cache &&
478478 ret == NULL &&
479- !(s->
480- session_ctx->session_cache_mode &
479+ !(s->session_ctx->session_cache_mode &
481480 SSL_SESS_CACHE_NO_INTERNAL_LOOKUP)) {
482481 SSL_SESSION data;
483482 data.ssl_version = s->version;
@@ -518,8 +517,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
518517 * well if and only if we are supposed to.
519518 */
520519 if (!
521- (s->
522- session_ctx->session_cache_mode &
520+ (s->session_ctx->session_cache_mode &
523521 SSL_SESS_CACHE_NO_INTERNAL_STORE))
524522 /*
525523 * The following should not return 1, otherwise, things are