diff options
Diffstat (limited to 'security/rnp/files')
| -rw-r--r-- | security/rnp/files/patch-src_lib_types.h | 19 | ||||
| -rw-r--r-- | security/rnp/files/patch-src_lib_utils.cpp | 31 | ||||
| -rw-r--r-- | security/rnp/files/patch-src_librekey_key__store__g10.cpp | 33 |
3 files changed, 0 insertions, 83 deletions
diff --git a/security/rnp/files/patch-src_lib_types.h b/security/rnp/files/patch-src_lib_types.h deleted file mode 100644 index 4262e8f2de42..000000000000 --- a/security/rnp/files/patch-src_lib_types.h +++ /dev/null @@ -1,19 +0,0 @@ ---- src/lib/types.h.orig 2024-05-03 10:03:14 UTC -+++ src/lib/types.h -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2017-2021, [Ribose Inc](https://www.ribose.com). -+ * Copyright (c) 2017-2024, [Ribose Inc](https://www.ribose.com). - * Copyright (c) 2009 The NetBSD Foundation, Inc. - * All rights reserved. - * -@@ -95,9 +95,6 @@ class id_str_pair { - static int lookup(const id_str_pair pair[], - const std::vector<uint8_t> &bytes, - int notfound = 0); -- static int lookup(const id_str_pair pair[], -- const std::basic_string<uint8_t> &bytes, -- int notfound = 0); - }; - - /** pgp_fingerprint_t */ diff --git a/security/rnp/files/patch-src_lib_utils.cpp b/security/rnp/files/patch-src_lib_utils.cpp deleted file mode 100644 index 761f5bd55c94..000000000000 --- a/security/rnp/files/patch-src_lib_utils.cpp +++ /dev/null @@ -1,31 +0,0 @@ ---- src/lib/utils.cpp.orig 2024-05-03 10:03:14 UTC -+++ src/lib/utils.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2021, [Ribose Inc](https://www.ribose.com). -+ * Copyright (c) 2021, 2024 [Ribose Inc](https://www.ribose.com). - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without -@@ -53,21 +53,6 @@ id_str_pair::lookup(const id_str_pair pair[], const st - - int - id_str_pair::lookup(const id_str_pair pair[], const std::vector<uint8_t> &bytes, int notfound) --{ -- while (pair && pair->str) { -- if ((strlen(pair->str) == bytes.size()) && -- !memcmp(pair->str, bytes.data(), bytes.size())) { -- return pair->id; -- } -- pair++; -- } -- return notfound; --} -- --int --id_str_pair::lookup(const id_str_pair pair[], -- const std::basic_string<uint8_t> &bytes, -- int notfound) - { - while (pair && pair->str) { - if ((strlen(pair->str) == bytes.size()) && diff --git a/security/rnp/files/patch-src_librekey_key__store__g10.cpp b/security/rnp/files/patch-src_librekey_key__store__g10.cpp deleted file mode 100644 index 688b54c380e4..000000000000 --- a/security/rnp/files/patch-src_librekey_key__store__g10.cpp +++ /dev/null @@ -1,33 +0,0 @@ ---- src/librekey/key_store_g10.cpp.orig 2024-05-03 10:03:14 UTC -+++ src/librekey/key_store_g10.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2017-2022, [Ribose Inc](https://www.ribose.com). -+ * Copyright (c) 2017-2024, [Ribose Inc](https://www.ribose.com). - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without -@@ -312,12 +312,12 @@ read_curve(const sexp_list_t *list, const std::string - - const auto &bytes = data->get_string(); - pgp_curve_t curve = static_cast<pgp_curve_t>( -- id_str_pair::lookup(g10_curve_aliases, data->get_string(), PGP_CURVE_UNKNOWN)); -+ id_str_pair::lookup(g10_curve_aliases, (const char *) bytes.data(), PGP_CURVE_UNKNOWN)); - if (curve != PGP_CURVE_UNKNOWN) { - key.curve = curve; - return true; - } -- RNP_LOG("Unknown curve: %.*s", (int) bytes.size(), (char *) bytes.data()); -+ RNP_LOG("Unknown curve: %.*s", (int) bytes.size(), (const char *) bytes.data()); - return false; - } - -@@ -806,7 +806,7 @@ g23_parse_seckey(pgp_key_pkt_t &seckey, - - auto & alg_bt = alg_s_exp->sexp_string_at(0)->get_string(); - pgp_pubkey_alg_t alg = static_cast<pgp_pubkey_alg_t>( -- id_str_pair::lookup(g10_alg_aliases, alg_bt.c_str(), PGP_PKA_NOTHING)); -+ id_str_pair::lookup(g10_alg_aliases, (const char *) alg_bt.data(), PGP_PKA_NOTHING)); - if (alg == PGP_PKA_NOTHING) { - RNP_LOG( - "Unsupported algorithm: '%.*s'", (int) alg_bt.size(), (const char *) alg_bt.data()); |