From: Source Maintenance Date: Fri, 30 Dec 2016 12:12:18 +0000 (+0000) Subject: SourceFormat Enforcement X-Git-Tag: M-staged-PR71~328 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac756c8c9ae584938bc121f16c4ce0b60a78b87b;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/ssl/bio.cc b/src/ssl/bio.cc index 3975a18681..4a1c013d9e 100644 --- a/src/ssl/bio.cc +++ b/src/ssl/bio.cc @@ -79,7 +79,7 @@ Ssl::Bio::Create(const int fd, Ssl::Bio::Type type) } const BIO_METHOD *useMethod = SquidMethods; #endif - + if (BIO *bio = BIO_new(useMethod)) { BIO_int_ctrl(bio, BIO_C_SET_FD, type, fd); return bio; diff --git a/src/ssl/gadgets.cc b/src/ssl/gadgets.cc index c753905279..eae4e7289e 100644 --- a/src/ssl/gadgets.cc +++ b/src/ssl/gadgets.cc @@ -30,7 +30,7 @@ EVP_PKEY * Ssl::createSslPrivateKey() Ssl::RSA_Pointer rsa(RSA_new()); if (!rsa) return NULL; - + int num = 2048; // Maybe use 4096 RSA keys, or better make it configurable? if (!RSA_generate_key_ex(rsa.get(), num, bn.get(), NULL)) return NULL; @@ -395,7 +395,6 @@ mimicExtensions(Security::CertPointer & cert, Security::CertPointer const &mimic const bool rsaPkey = (EVP_PKEY_get0_RSA(certKey) != NULL); #endif - int added = 0; int nid; for (int i = 0; (nid = extensions[i]) != 0; ++i) { diff --git a/src/ssl/support.cc b/src/ssl/support.cc index 09c1dd0e36..3d35f9c26d 100644 --- a/src/ssl/support.cc +++ b/src/ssl/support.cc @@ -1141,7 +1141,7 @@ hasAuthorityInfoAccessCaIssuers(X509 *cert) #else ASN1_STRING_get0_data(ad->location->d.uniformResourceIdentifier) #endif - ), + ), sizeof(uri)); } break;