настроили билиотеку curl

curl/BUILD-HASHES.txt

@@ -1,7 +1,7 @@
 SHA2-256(./bin/curl-ca-bundle.crt)= ab3ee3651977a4178a702b0b828a4ee7b2bbb9127235b0ab740e2e15974bf5db
-SHA2-256(./bin/curl.exe)= 36349c859b8b9e44a6c0140d17c1742a7a12371f20efd48170d93758fcdc76a8
-SHA2-256(./bin/libcurl.def)= fc8449996b7661b9ae9c0ed67c847f1c7241a9ef3db717a5d578012f34fb00da
-SHA2-256(./bin/libcurl.dll)= 01f487592e94c9b99ff247a4fe976aa1adc012e9c1769b2778719f045f15eaa1
+SHA2-256(./bin/curl.exe)= 57ae04dfc5c82dce19b1241d88e45e21b0a3307aa432f7e090295441b4e6c375
+SHA2-256(./bin/libcurl-x64.def)= fc8449996b7661b9ae9c0ed67c847f1c7241a9ef3db717a5d578012f34fb00da
+SHA2-256(./bin/libcurl-x64.dll)= 3027a2941b76e9127ac95fd27b603b30cf401dbe30786c51113c985b79c53a28
 SHA2-256(./include/brotli/decode.h)= 20d0a87a96bc25a3af7557075be87be4393e88a5fb564db08e92884dee17d841
 SHA2-256(./include/brotli/encode.h)= 3403a597eff24ff45903128feb471e4dd5138f624104ebe058a9d90ed905550c
 SHA2-256(./include/brotli/port.h)= d87dae6cce00aff76192a1db4fedc2a817967e14e652829349b8a75088f9e467
@@ -69,7 +69,7 @@ SHA2-256(./include/openssl/modes.h)= a8993a5bdfad225b207971039657000250b3239d7ca
 SHA2-256(./include/openssl/obj_mac.h)= 4270ca80a060fdcaf77e31ce3dcd85ed92cceeb23aed7a6af8d92c84aff54075
 SHA2-256(./include/openssl/objects.h)= dcf127aedcc6a9fbf4abc6dfacbf6d234a003d5c390025f4785c3407cbe99cf2
 SHA2-256(./include/openssl/ocsp.h)= 74bf587344a632fee6721e93a3991de1c5cdafe762fc7ff3d22ea614ea8505f7
-SHA2-256(./include/openssl/opensslconf.h)= 751f7b5926ce8c0b754371863012ed31d54305d4e15bdd89449b07862b6a4181
+SHA2-256(./include/openssl/opensslconf.h)= 12907133aec34951c7154f85b0a4b716dd9f8522e1f88935e971b7e32e100293
 SHA2-256(./include/openssl/opensslfeatures.h)= b6cb250da81ac43dfe8fe76f512f7b4ee81c036a76a98a0f9f656bcf218d86e7
 SHA2-256(./include/openssl/opensslv.h)= 223b94f36e5212aa3ea042e56ef39787f6ec316f9e622bcba0fb5c48907598be
 SHA2-256(./include/openssl/ossl_typ.h)= 74a337679d1a99aee06bdd11a3b7d814932f0ed772a1c09cbf799c6b7297158c
@@ -104,17 +104,17 @@ SHA2-256(./include/zlib.h)= 0f502ab19b9200f6c390945c0fc860816fd0a082e6a01925f732
 SHA2-256(./include/zlib_name_mangling.h)= 38e51a846d6c2bd6100298c55328dba4437c08fa1dceda4eb2e06ecb1d142058
 SHA2-256(./include/zstd.h)= 9b4bc8245565c98ccfc61c07749928b57e7c0f6fddb0530c4f6aa1971893d88b
 SHA2-256(./include/zstd_errors.h)= 66a8c3f71d12ea6e797e4f622f31f3f8f81c41b36f48cad4f5de7d8bfb6aac0a
-SHA2-256(./lib/libbrotlicommon.a)= c4ace1c46440e01236addfc1d1ec8f05955766343d972623a90efcdbb499e034
-SHA2-256(./lib/libbrotlidec.a)= 835885e909672a7af460810e68963b020149578f11be9b8d8390b3081c6c38dd
-SHA2-256(./lib/libcrypto.a)= d671d623b917d5f66039c3e4a78bd306c12704a3069af62a9103ce13e7d7ab1e
-SHA2-256(./lib/libcurl.a)= 9665a6fb4e99307bb7ebde5749ef5baacac66d6921b68ddb9abc9a50111377d1
-SHA2-256(./lib/libcurl.dll.a)= ef73ac11d2dd1edda3266b0a9f6e1560f9367ac0d898f62ff2f38d4ba129986b
-SHA2-256(./lib/libnghttp2.a)= 52e9b6c87330aed345697c2ef122d9d0f7c6742521081bd3a8012700c4325ef6
-SHA2-256(./lib/libnghttp3.a)= c5f17db65999032e3b4defbfc418b9d0634e5a5408b6d9e44f39fb3e27e4ece9
-SHA2-256(./lib/libngtcp2.a)= 0e789e9c9c7da8df68c321218ad160606aa3e7e5f4267130810059b9c961188c
-SHA2-256(./lib/libngtcp2_crypto_quictls.a)= c51a5af666309ed3330ee5c555961dd21bf78eb383ad9a79f02e58cf3eb17844
-SHA2-256(./lib/libpsl.a)= a6bc60a2ba23a7fa11c34b36aecdc15da657914df7af331ac578597aa7e7072d
-SHA2-256(./lib/libssh2.a)= 78d6fb6b0f4cd27db4ac4a58f3b2a21168c4fd510406ad9423f41a1faff4dbbe
-SHA2-256(./lib/libssl.a)= 9d0d2fd377afe2cfcaeaa93e00a75e41d34bc902ac96292cb6cbb6ddfd239b0b
-SHA2-256(./lib/libz.a)= 2b3286c15298057dbe5899c9fe8aeb4021969863cbcf1c8142750c06114f73c9
-SHA2-256(./lib/libzstd.a)= ad185e0aa92a054d7260a119079b97a71eea37227221bba93b4c1b0380ec90ff
+SHA2-256(./lib/libbrotlicommon.a)= 1c6a6ff41a2a1ec0bfe8bdfe8e27127fce59e16df88e0b9060e63b11e0a9ddaf
+SHA2-256(./lib/libbrotlidec.a)= 8c5a2d2004888de89972cbb9f3299fe385ca1953068cd1a573ed79d84d53b7e9
+SHA2-256(./lib/libcrypto.a)= 6b8fff99effdad113e32b4a2389b2a10e2da7788771b213b3f8fab98bfb12f65
+SHA2-256(./lib/libcurl.a)= 9ec43d5db9869d0030456827cd497946a063571b72d7217fef6aa0b9992cc10c
+SHA2-256(./lib/libcurl.dll.a)= 48d31aeb7eeb9efcee391765bd7f18dabfcb9e36fd4bc9b7d7dac37658d9c634
+SHA2-256(./lib/libnghttp2.a)= c516ac51da540e32535b6d4e8a5df7b399abd3edda55c9a180b478e501bf07e7
+SHA2-256(./lib/libnghttp3.a)= 4f705100a92ad0f19648c40310c0c88f12c0414127fca01e90073b23e7d16d3d
+SHA2-256(./lib/libngtcp2.a)= dfabed9661b686258629122fe24685e920e4d538f8e6cfb3619127bbbecc96c4
+SHA2-256(./lib/libngtcp2_crypto_quictls.a)= 7439d28649e8fbc4b02bf69de8028812357fd934cc41cceedc4baf6d5ab7026c
+SHA2-256(./lib/libpsl.a)= 711865fc20f356bebbfe55f2a2b9a4be49b935d151015c64b104c773d3e69c8a
+SHA2-256(./lib/libssh2.a)= ae90e3a9e7da4bc572102d4886b9833620b8bb7c65d291703df9c938c538a66b
+SHA2-256(./lib/libssl.a)= 4db85abf49d73206ecda2233b1efed68f4c367bb35c92c34a02a83ed6e2d1eaf
+SHA2-256(./lib/libz.a)= 7d6f8b7f7033e72a6f6a4f1815a081ff14a1a22abdf3e19799aa743f11bc3c30
+SHA2-256(./lib/libzstd.a)= dca30484c301668b263f154d060f225d7f1d2f3339527c5183bc42673aa86565

curl/include/openssl/opensslconf.h

@@ -46,7 +46,7 @@
  * This enables code handling data aligned at natural CPU word
  * boundary. See crypto/rc4/rc4_enc.c for further details.
  */
-#undef RC4_CHUNK
+#define RC4_CHUNK unsigned long
 #endif
 #endif
 
@@ -54,25 +54,20 @@
 /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
  * %20 speed up (longs are 8 bytes, int's are 4). */
 #ifndef DES_LONG
-#define DES_LONG unsigned long
+#define DES_LONG unsigned int
 #endif
 #endif
 
 #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
 #define CONFIG_HEADER_BN_H
-#define BN_LLONG
+#undef BN_LLONG
 
 /* Should we define BN_DIV2W here? */
 
 /* Only one for the following should be defined */
-/* The prime number generation stuff may not work when
- * EIGHT_BIT but I don't care since I've only used this mode
- * for debugging the bignum libraries */
-#undef SIXTY_FOUR_BIT_LONG
+#define SIXTY_FOUR_BIT_LONG
 #undef SIXTY_FOUR_BIT
-#define THIRTY_TWO_BIT
-#undef SIXTEEN_BIT
-#undef EIGHT_BIT
+#undef THIRTY_TWO_BIT
 #endif
 
 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
@@ -86,14 +81,14 @@
 /* the following is tweaked from a config script, that is why it is a
  * protected undef/define */
 #ifndef DES_PTR
-#define DES_PTR
+#undef DES_PTR
 #endif
 
 /* This helps C compiler generate the correct code for multiple functional
  * units.  It reduces register dependencies at the expense of 2 more
  * registers */
 #ifndef DES_RISC1
-#define DES_RISC1
+#undef DES_RISC1
 #endif
 
 #ifndef DES_RISC2

main.cpp

@@ -1,3 +1,4 @@
+#include <curl/curl.h>
 #include <iostream>
 #include <vector>
 #include "histogram.h"
@@ -37,6 +38,7 @@ Input input_data(std::istream& in, bool prompt) {
 }
 
 int main() {
+    curl_global_init(CURL_GLOBAL_ALL);
     using namespace std;
     auto in = input_data(cin,true);
     auto bins = make_histogram(in.bin_count, in.numbers);

svg.cpp

@@ -43,7 +43,6 @@ show_histogram_svg(const vector<size_t>& bins)
     const auto TEXT_BASELINE = 20;
     const auto TEXT_WIDTH = 50;
     const auto BIN_HEIGHT = 30;
-    const auto BLOCK_WIDTH = 10;
     const auto YELLOW = "yellow";
     const auto PURPLE = "purple";
     const auto MAX_WIDTH = IMAGE_WIDTH-TEXT_WIDTH;