summaryrefslogtreecommitdiff
path: root/Userland/Libraries/LibCrypto/ASN1
diff options
context:
space:
mode:
authorAli Mohammad Pur <ali.mpfard@gmail.com>2022-12-13 10:29:30 +0330
committerAndreas Kling <kling@serenityos.org>2022-12-14 11:44:32 +0100
commitf96a3c002aa994d5811a677bd93553ccf9a8abf1 (patch)
treec22c82871d944c345bc6bad1e21d57f37800d1f4 /Userland/Libraries/LibCrypto/ASN1
parent72514d6915a685552a258d2e4c85d9d52184c1b6 (diff)
downloadserenity-f96a3c002aa994d5811a677bd93553ccf9a8abf1.zip
Everywhere: Stop shoving things into ::std and mentioning them as such
Note that this still keeps the old behaviour of putting things in std by default on serenity so the tools can be happy, but if USING_AK_GLOBALLY is unset, AK behaves like a good citizen and doesn't try to put things in the ::std namespace. std::nothrow_t and its friends get to stay because I'm being told that compilers assume things about them and I can't yeet them into a different namespace...for now.
Diffstat (limited to 'Userland/Libraries/LibCrypto/ASN1')
-rw-r--r--Userland/Libraries/LibCrypto/ASN1/DER.cpp2
-rw-r--r--Userland/Libraries/LibCrypto/ASN1/DER.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Userland/Libraries/LibCrypto/ASN1/DER.cpp b/Userland/Libraries/LibCrypto/ASN1/DER.cpp
index 4d398a6b20..8570387be7 100644
--- a/Userland/Libraries/LibCrypto/ASN1/DER.cpp
+++ b/Userland/Libraries/LibCrypto/ASN1/DER.cpp
@@ -126,7 +126,7 @@ Result<StringView, DecodeError> Decoder::decode_octet_string(ReadonlyBytes bytes
return StringView { bytes.data(), bytes.size() };
}
-Result<std::nullptr_t, DecodeError> Decoder::decode_null(ReadonlyBytes data)
+Result<nullptr_t, DecodeError> Decoder::decode_null(ReadonlyBytes data)
{
if (data.size() != 0)
return DecodeError::InvalidInputFormat;
diff --git a/Userland/Libraries/LibCrypto/ASN1/DER.h b/Userland/Libraries/LibCrypto/ASN1/DER.h
index 6081c40473..e3c3f46778 100644
--- a/Userland/Libraries/LibCrypto/ASN1/DER.h
+++ b/Userland/Libraries/LibCrypto/ASN1/DER.h
@@ -217,7 +217,7 @@ private:
static Result<bool, DecodeError> decode_boolean(ReadonlyBytes);
static Result<UnsignedBigInteger, DecodeError> decode_arbitrary_sized_integer(ReadonlyBytes);
static Result<StringView, DecodeError> decode_octet_string(ReadonlyBytes);
- static Result<std::nullptr_t, DecodeError> decode_null(ReadonlyBytes);
+ static Result<nullptr_t, DecodeError> decode_null(ReadonlyBytes);
static Result<Vector<int>, DecodeError> decode_object_identifier(ReadonlyBytes);
static Result<StringView, DecodeError> decode_printable_string(ReadonlyBytes);
static Result<BitStringView, DecodeError> decode_bit_string(ReadonlyBytes);