diff --git a/ProgUit Lab1/ProgUit Lab1.cpp b/ProgUit Lab1/ProgUit Lab1.cpp index 3c058ac..9268f78 100644 --- a/ProgUit Lab1/ProgUit Lab1.cpp +++ b/ProgUit Lab1/ProgUit Lab1.cpp @@ -3,6 +3,8 @@ #include "histogram.h" #include "text.h" +#include + @@ -60,6 +62,9 @@ input_data(istream& hin, bool promt = false) { int main() { + curl_global_init(CURL_GLOBAL_ALL); + + string promt; bool promt1; diff --git a/curl/BUILD-HASHES.txt b/curl/BUILD-HASHES.txt index a07e0ef..59548d6 100644 --- a/curl/BUILD-HASHES.txt +++ b/curl/BUILD-HASHES.txt @@ -1,7 +1,7 @@ SHA2-256(./bin/curl-ca-bundle.crt)= ab3ee3651977a4178a702b0b828a4ee7b2bbb9127235b0ab740e2e15974bf5db -SHA2-256(./bin/curl.exe)= 2eb6251d8b856a12c9ab6f09de9302db58b988fbaaf23ce791ab98f4fce4ed20 -SHA2-256(./bin/libcurl-arm64.def)= fc8449996b7661b9ae9c0ed67c847f1c7241a9ef3db717a5d578012f34fb00da -SHA2-256(./bin/libcurl-arm64.dll)= 84a5e57eb8b1ede1360c67a6d8eacbe35aaa16d101fa5faa5cf2aef1f9c4fe28 +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)= ebc770e6cc94cb5cfa19a742311e1347dfb45105fa2f0fc26cf5af8c7180860a +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)= 5709cbab76a2a0b4e37bf62c6495b84c5af23be6d90d91af303d0035e68c0174 -SHA2-256(./lib/libbrotlidec.a)= adc5098d760643f4936ead3b033dcb7098a9c2d93ea044214e4598fa06816161 -SHA2-256(./lib/libcrypto.a)= 5bada3676807206a74ec470b2c7130e4edae157a07a97c2cb2dd9755fbc22ed1 -SHA2-256(./lib/libcurl.a)= 8a2a0ad75434241348008ada0f5ccb99776e717948b81c896ec6ff776c9a3504 -SHA2-256(./lib/libcurl.dll.a)= 2e173b9e274e1e98653025b7c0029d37d81bc1afbf7b2fa3f9e6e60847a61a6d -SHA2-256(./lib/libnghttp2.a)= be2b2e5aa177938024f1bcd3c04916f5e870caadb034073952c72402f75ef877 -SHA2-256(./lib/libnghttp3.a)= 932aabd051b3634562a5c8b86e8ca834f2e320b75b6464be812f53a1f1894304 -SHA2-256(./lib/libngtcp2.a)= d41de02a37c8c8a104e9473a382a1f2b0942777b01c509efe4b6d072047c898e -SHA2-256(./lib/libngtcp2_crypto_quictls.a)= 97acd4075d795a16611fc959a41c6a92af2d42ac6ff60b36c635d5ac379702b6 -SHA2-256(./lib/libpsl.a)= 668a7d9a99d8b867d75c88d852a88ce37fc22300984b3ddfa9811096467e9324 -SHA2-256(./lib/libssh2.a)= d729438d301d4869a821b4845a2897d35e931ac73a91cf0f47c3d126cda02058 -SHA2-256(./lib/libssl.a)= b8450aa342236a4eb0d7461c0ad7c97d68d91d0e7192051166e019eb2d6406dd -SHA2-256(./lib/libz.a)= e7dd6ca0b0ee45aacbce51200cbb154f592167efea8453c18889841af0ca139c -SHA2-256(./lib/libzstd.a)= 0c6addda5b6e056bb4bf66212078e2f686707146a2e09d63e63a4c0fec51211a +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 diff --git a/curl/BUILD-MANIFEST.txt b/curl/BUILD-MANIFEST.txt index 5c6a3f9..3c63b8d 100644 --- a/curl/BUILD-MANIFEST.txt +++ b/curl/BUILD-MANIFEST.txt @@ -1,5 +1,5 @@ -.clang 20.1.5 -.llvm-mingw 20250514 https://github.com/mstorsjo/llvm-mingw/releases/download/20250514/llvm-mingw-20250514-ucrt-ubuntu-22.04-x86_64.tar.xz +.clang 19.1.7 +.mingw-w64 12.0.0-5 zlibng 2.2.4 https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.2.4.tar.gz zstd 1.5.7 https://github.com/facebook/zstd/releases/download/v1.5.7/zstd-1.5.7.tar.gz brotli 1.1.0 https://github.com/google/brotli/archive/v1.1.0.tar.gz diff --git a/curl/bin/curl.exe b/curl/bin/curl.exe index 3a89a29..c09630a 100644 Binary files a/curl/bin/curl.exe and b/curl/bin/curl.exe differ diff --git a/curl/bin/libcurl-arm64.dll b/curl/bin/libcurl-arm64.dll deleted file mode 100644 index b1263dd..0000000 Binary files a/curl/bin/libcurl-arm64.dll and /dev/null differ diff --git a/curl/bin/libcurl-arm64.def b/curl/bin/libcurl-x64.def similarity index 100% rename from curl/bin/libcurl-arm64.def rename to curl/bin/libcurl-x64.def diff --git a/curl/bin/libcurl-x64.dll b/curl/bin/libcurl-x64.dll new file mode 100644 index 0000000..74a8a58 Binary files /dev/null and b/curl/bin/libcurl-x64.dll differ diff --git a/curl/include/openssl/opensslconf.h b/curl/include/openssl/opensslconf.h index 731b06a..cc19376 100644 --- a/curl/include/openssl/opensslconf.h +++ b/curl/include/openssl/opensslconf.h @@ -65,14 +65,9 @@ /* 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 */ #define SIXTY_FOUR_BIT_LONG #undef SIXTY_FOUR_BIT #undef THIRTY_TWO_BIT -#undef SIXTEEN_BIT -#undef EIGHT_BIT #endif #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) diff --git a/curl/lib/libbrotlicommon.a b/curl/lib/libbrotlicommon.a index 98273a2..1ec09eb 100644 Binary files a/curl/lib/libbrotlicommon.a and b/curl/lib/libbrotlicommon.a differ diff --git a/curl/lib/libbrotlidec.a b/curl/lib/libbrotlidec.a index 27210f1..7c67de1 100644 Binary files a/curl/lib/libbrotlidec.a and b/curl/lib/libbrotlidec.a differ diff --git a/curl/lib/libcrypto.a b/curl/lib/libcrypto.a index 731d827..1c82e01 100644 Binary files a/curl/lib/libcrypto.a and b/curl/lib/libcrypto.a differ diff --git a/curl/lib/libcurl.a b/curl/lib/libcurl.a index a7edd83..1058168 100644 Binary files a/curl/lib/libcurl.a and b/curl/lib/libcurl.a differ diff --git a/curl/lib/libcurl.dll.a b/curl/lib/libcurl.dll.a index de600ee..49bdc45 100644 Binary files a/curl/lib/libcurl.dll.a and b/curl/lib/libcurl.dll.a differ diff --git a/curl/lib/libnghttp2.a b/curl/lib/libnghttp2.a index 8b331c2..a6d7d24 100644 Binary files a/curl/lib/libnghttp2.a and b/curl/lib/libnghttp2.a differ diff --git a/curl/lib/libnghttp3.a b/curl/lib/libnghttp3.a index 85ddb28..f9c4291 100644 Binary files a/curl/lib/libnghttp3.a and b/curl/lib/libnghttp3.a differ diff --git a/curl/lib/libngtcp2.a b/curl/lib/libngtcp2.a index 41b0309..582c723 100644 Binary files a/curl/lib/libngtcp2.a and b/curl/lib/libngtcp2.a differ diff --git a/curl/lib/libngtcp2_crypto_quictls.a b/curl/lib/libngtcp2_crypto_quictls.a index e2a1b2f..d53db26 100644 Binary files a/curl/lib/libngtcp2_crypto_quictls.a and b/curl/lib/libngtcp2_crypto_quictls.a differ diff --git a/curl/lib/libpsl.a b/curl/lib/libpsl.a index ac9b1be..8f430b1 100644 Binary files a/curl/lib/libpsl.a and b/curl/lib/libpsl.a differ diff --git a/curl/lib/libssh2.a b/curl/lib/libssh2.a index 3b1777c..3d583f2 100644 Binary files a/curl/lib/libssh2.a and b/curl/lib/libssh2.a differ diff --git a/curl/lib/libssl.a b/curl/lib/libssl.a index 8f765c3..aeb314b 100644 Binary files a/curl/lib/libssl.a and b/curl/lib/libssl.a differ diff --git a/curl/lib/libz.a b/curl/lib/libz.a index fb30725..19c90be 100644 Binary files a/curl/lib/libz.a and b/curl/lib/libz.a differ diff --git a/curl/lib/libzstd.a b/curl/lib/libzstd.a index 76f43c2..5c88dd2 100644 Binary files a/curl/lib/libzstd.a and b/curl/lib/libzstd.a differ