From 2a241a11bbfaad4ec27b0dc051958426df3f22e1 Mon Sep 17 00:00:00 2001 From: AnotherTest Date: Fri, 29 May 2020 19:54:23 +0430 Subject: [PATCH] LibCrypto: Fix some issues preventing compilation w/ clang 10 --- Libraries/LibCrypto/ASN1/DER.h | 2 +- Libraries/LibCrypto/Cipher/Mode/CBC.h | 2 +- Userland/test-crypto.cpp | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Libraries/LibCrypto/ASN1/DER.h b/Libraries/LibCrypto/ASN1/DER.h index 32552c21f7..9f78efba97 100644 --- a/Libraries/LibCrypto/ASN1/DER.h +++ b/Libraries/LibCrypto/ASN1/DER.h @@ -265,7 +265,7 @@ constexpr static bool der_length_sequence(ASN1::List* list, size_t in_length, si return true; } -static bool der_decode_sequence(const u8* in, size_t in_length, ASN1::List* list, size_t out_length, bool ordered = true) +static inline bool der_decode_sequence(const u8* in, size_t in_length, ASN1::List* list, size_t out_length, bool ordered = true) { if (in_length < 2) { dbg() << "header too small"; diff --git a/Libraries/LibCrypto/Cipher/Mode/CBC.h b/Libraries/LibCrypto/Cipher/Mode/CBC.h index 45fb966f0b..e9708882c7 100644 --- a/Libraries/LibCrypto/Cipher/Mode/CBC.h +++ b/Libraries/LibCrypto/Cipher/Mode/CBC.h @@ -53,7 +53,7 @@ public: return builder.build(); } - virtual size_t IV_length() const { return IVSizeInBits / 8; } + virtual size_t IV_length() const override { return IVSizeInBits / 8; } virtual Optional encrypt(const ByteBuffer& in, ByteBuffer& out, Optional ivec = {}) override { diff --git a/Userland/test-crypto.cpp b/Userland/test-crypto.cpp index 8c44622290..6d79108fe3 100644 --- a/Userland/test-crypto.cpp +++ b/Userland/test-crypto.cpp @@ -61,7 +61,6 @@ constexpr const char* DEFAULT_DIGEST_SUITE { "HMAC-SHA256" }; constexpr const char* DEFAULT_HASH_SUITE { "SHA256" }; constexpr const char* DEFAULT_CIPHER_SUITE { "AES_CBC" }; constexpr const char* DEFAULT_SERVER { "www.google.com" }; -constexpr int DEFAULT_PORT { 443 }; // listAllTests // Cipher