linuxdcpp-team team mailing list archive
-
linuxdcpp-team team
-
Mailing list archive
-
Message #02643
[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2321: Update OpenSSL to version 1.0.0c
------------------------------------------------------------
revno: 2321
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-12-03 17:16:35 +0100
message:
Update OpenSSL to version 1.0.0c
modified:
SConstruct
changelog.txt
dcpp/AdcHub.cpp
dcpp/HashBloom.cpp
openssl/include/openssl/opensslv.h
openssl/include/openssl/safestack.h
openssl/lib/libcrypto.a
openssl/lib/libssl.a
openssl/lib/x64/libcrypto.a
openssl/lib/x64/libssl.a
--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk
Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription
=== modified file 'SConstruct'
--- SConstruct 2010-11-24 19:05:54 +0000
+++ SConstruct 2010-12-03 16:16:35 +0000
@@ -180,6 +180,9 @@
html_lib = html_lib + env['arch'] + '/'
env.Append(LIBPATH = [html_lib])
+ # for MinGW64 to accept natupnp.h
+ env.Append(CPPDEFINES = ['__MIDL_user_allocate_free_DEFINED__'])
+
env.Append(CPPDEFINES = defs[env['mode']])
env.Append(CPPDEFINES = defs['common'])
=== modified file 'changelog.txt'
--- changelog.txt 2010-12-03 13:59:16 +0000
+++ changelog.txt 2010-12-03 16:16:35 +0000
@@ -34,16 +34,16 @@
* [ADC] Support hidden users as per the ADC ext spec (poy)
* [ADC] Group search extensions thanks to "SEGA" (poy)
* Keep search history in file list windows (emtee)
-* Update OpenSSL to version 1.0.0b (poy)
+* Update OpenSSL to version 1.0.0c (poy)
* [L#378829] Make sure our OpenSSL binaries aren't "optimized for MS-DOS" (poy)
* [L#674545] Add magnet keyword search (thanks flow84)
* [L#506288] Save settings periodically (poy)
* Add titles to various menus (poy)
* [L#535556] Make sure menus are not too wide (poy)
-* [L#610466] Fix share files instantly when unfinished folder and download target is not on the same drive (emtee)
-* [L#300728] Fix infinitive recursion when sharing a directory with broken name on unix (thanks alexander sashnov)
+* [L#610466] Fix sharing of downloaded files from different drives (emtee)
+* [L#300728] Fix infinite recursion when sharing a directory with a broken name on unix (thanks alexander sashnov)
* [L#250149] Retry on more possible Coral errors (emtee)
-* [L#260748] Really readded sfv check (was broken since segmented downloading introduced) (emtee)
+* [L#260748] Really readded sfv check (was broken by segmented downloading) (emtee)
-- 0.770 2010-07-05 --
* [L#550300] Catch more potential file corruptions (thanks bigmuscle)
=== modified file 'dcpp/AdcHub.cpp'
--- dcpp/AdcHub.cpp 2010-11-28 15:52:39 +0000
+++ dcpp/AdcHub.cpp 2010-12-03 16:16:35 +0000
@@ -34,7 +34,7 @@
#include "LogManager.h"
#include "ThrottleManager.h"
-#include <math.h>
+#include <cmath>
namespace dcpp {
@@ -818,80 +818,77 @@
c.addParam("TY", "2");
}
- if(!aExtList.empty()) {
+ if(aExtList.size() > 2) {
StringList exts = aExtList;
-
- if(exts.size() > 2) {
- sort(exts.begin(), exts.end());
-
- uint8_t gr = 0;
- StringList rx;
-
- const auto& searchExts = getSearchExts();
- for(auto i = searchExts.cbegin(), iend = searchExts.cend(); i != iend; ++i) {
- const StringList& def = *i;
-
- // gather the exts not present in any of the lists
- StringList temp(def.size() + exts.size());
- temp = StringList(temp.begin(), set_symmetric_difference(def.begin(), def.end(),
- exts.begin(), exts.end(), temp.begin()));
-
- // figure out whether the remaining exts have to be added or removed from the set
- StringList rm;
- bool ok = true;
- for(auto diff = temp.begin(); diff != temp.end();) {
- if(find(def.cbegin(), def.cend(), *diff) == def.cend()) {
- ++diff; // will be added further below as an "EX"
- } else {
- if(rm.size() == 2) {
- ok = false;
- break;
- }
- rm.push_back(*diff);
- diff = temp.erase(diff);
+ sort(exts.begin(), exts.end());
+
+ uint8_t gr = 0;
+ StringList rx;
+
+ const auto& searchExts = getSearchExts();
+ for(auto i = searchExts.cbegin(), iend = searchExts.cend(); i != iend; ++i) {
+ const StringList& def = *i;
+
+ // gather the exts not present in any of the lists
+ StringList temp(def.size() + exts.size());
+ temp = StringList(temp.begin(), set_symmetric_difference(def.begin(), def.end(),
+ exts.begin(), exts.end(), temp.begin()));
+
+ // figure out whether the remaining exts have to be added or removed from the set
+ StringList rx_;
+ bool ok = true;
+ for(auto diff = temp.begin(); diff != temp.end();) {
+ if(find(def.cbegin(), def.cend(), *diff) == def.cend()) {
+ ++diff; // will be added further below as an "EX"
+ } else {
+ if(rx_.size() == 2) {
+ ok = false;
+ break;
}
+ rx_.push_back(*diff);
+ diff = temp.erase(diff);
}
- if(!ok) // too many "RX"s necessary - disregard this group
- continue;
-
- // let's include this group!
- gr += 1 << (i - searchExts.cbegin());
-
- exts = temp; // the exts to still add (that were not defined in the group)
-
- rx.insert(rx.begin(), rm.begin(), rm.end());
-
- if(exts.size() <= 2)
- break;
- // keep looping to see if there are more exts that can be grouped
- }
-
- if(gr) {
- // some extensions can be grouped; let's send a command with grouped exts.
- AdcCommand c_gr(AdcCommand::CMD_SCH, AdcCommand::TYPE_FEATURE);
- c_gr.setFeatures('+' + SEGA_FEATURE);
-
- const auto& params = c.getParameters();
- for(auto i = params.cbegin(), iend = params.cend(); i != iend; ++i)
- c_gr.addParam(*i);
-
- for(auto i = exts.cbegin(), iend = exts.cend(); i != iend; ++i)
- c_gr.addParam("EX", *i);
- c_gr.addParam("GR", Util::toString(gr));
- for(auto i = rx.cbegin(), iend = rx.cend(); i != iend; ++i)
- c_gr.addParam("RX", *i);
-
- sendSearch(c_gr);
-
- // make sure users with the feature don't receive the search twice.
- c.setType(AdcCommand::TYPE_FEATURE);
- c.setFeatures('-' + SEGA_FEATURE);
- }
- }
-
- for(auto i = aExtList.cbegin(), iend = aExtList.cend(); i != iend; ++i)
- c.addParam("EX", *i);
+ }
+ if(!ok) // too many "RX"s necessary - disregard this group
+ continue;
+
+ // let's include this group!
+ gr += 1 << (i - searchExts.cbegin());
+
+ exts = temp; // the exts to still add (that were not defined in the group)
+
+ rx.insert(rx.begin(), rx_.begin(), rx_.end());
+
+ if(exts.size() <= 2)
+ break;
+ // keep looping to see if there are more exts that can be grouped
+ }
+
+ if(gr) {
+ // some extensions can be grouped; let's send a command with grouped exts.
+ AdcCommand c_gr(AdcCommand::CMD_SCH, AdcCommand::TYPE_FEATURE);
+ c_gr.setFeatures('+' + SEGA_FEATURE);
+
+ const auto& params = c.getParameters();
+ for(auto i = params.cbegin(), iend = params.cend(); i != iend; ++i)
+ c_gr.addParam(*i);
+
+ for(auto i = exts.cbegin(), iend = exts.cend(); i != iend; ++i)
+ c_gr.addParam("EX", *i);
+ c_gr.addParam("GR", Util::toString(gr));
+ for(auto i = rx.cbegin(), iend = rx.cend(); i != iend; ++i)
+ c_gr.addParam("RX", *i);
+
+ sendSearch(c_gr);
+
+ // make sure users with the feature don't receive the search twice.
+ c.setType(AdcCommand::TYPE_FEATURE);
+ c.setFeatures('-' + SEGA_FEATURE);
+ }
}
+
+ for(auto i = aExtList.cbegin(), iend = aExtList.cend(); i != iend; ++i)
+ c.addParam("EX", *i);
}
sendSearch(c);
=== modified file 'dcpp/HashBloom.cpp'
--- dcpp/HashBloom.cpp 2008-07-30 12:12:42 +0000
+++ dcpp/HashBloom.cpp 2010-12-03 16:16:35 +0000
@@ -3,7 +3,7 @@
#include "HashBloom.h"
-#include <math.h>
+#include <cmath>
namespace dcpp {
=== modified file 'openssl/include/openssl/opensslv.h'
--- openssl/include/openssl/opensslv.h 2010-11-21 19:11:21 +0000
+++ openssl/include/openssl/opensslv.h 2010-12-03 16:16:35 +0000
@@ -25,11 +25,11 @@
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta)
*/
-#define OPENSSL_VERSION_NUMBER 0x1000002f
+#define OPENSSL_VERSION_NUMBER 0x1000003f
#ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0b-fips 16 Nov 2010"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0c-fips 2 Dec 2010"
#else
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0b 16 Nov 2010"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0c 2 Dec 2010"
#endif
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
=== modified file 'openssl/include/openssl/safestack.h'
--- openssl/include/openssl/safestack.h 2010-11-21 19:11:21 +0000
+++ openssl/include/openssl/safestack.h 2010-12-03 16:16:35 +0000
@@ -179,7 +179,8 @@
sk_is_sorted(CHECKED_STACK_OF(type, st))
#define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
- (STACK_OF(type) *)d2i_ASN1_SET((STACK_OF(OPENSSL_BLOCK) **)CHECKED_STACK_OF(type, st), \
+ (STACK_OF(type) *)d2i_ASN1_SET( \
+ (STACK_OF(OPENSSL_BLOCK) **)CHECKED_PTR_OF(STACK_OF(type)*, st), \
pp, length, \
CHECKED_D2I_OF(type, d2i_func), \
CHECKED_SK_FREE_FUNC(type, free_func), \
=== modified file 'openssl/lib/libcrypto.a'
Binary files openssl/lib/libcrypto.a 2010-11-23 18:24:00 +0000 and openssl/lib/libcrypto.a 2010-12-03 16:16:35 +0000 differ
=== modified file 'openssl/lib/libssl.a'
Binary files openssl/lib/libssl.a 2010-11-23 18:24:00 +0000 and openssl/lib/libssl.a 2010-12-03 16:16:35 +0000 differ
=== modified file 'openssl/lib/x64/libcrypto.a'
Binary files openssl/lib/x64/libcrypto.a 2010-11-23 18:24:00 +0000 and openssl/lib/x64/libcrypto.a 2010-12-03 16:16:35 +0000 differ
=== modified file 'openssl/lib/x64/libssl.a'
Binary files openssl/lib/x64/libssl.a 2010-11-23 18:24:00 +0000 and openssl/lib/x64/libssl.a 2010-12-03 16:16:35 +0000 differ
