Merge bn.h and ossl_common.h to ossl_utils.hpp, and remove unused code.

rnpgp · Nov 28, 2024 · 7a9f582 · 7a9f582
1 parent 9be8d3c
commit 7a9f582
Show file tree

Hide file tree

Showing 21 changed files with 31 additions and 213 deletions.
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
@@ -241,7 +241,6 @@ configure_file(config.h.in config.h)
 
 if(CRYPTO_BACKEND_OPENSSL)
   set(CRYPTO_SOURCES
-    crypto/bn_ossl.cpp
     crypto/dsa_common.cpp
     crypto/dsa_ossl.cpp
     crypto/ec_curves.cpp

diff --git a/src/lib/crypto/backend_version.cpp b/src/lib/crypto/backend_version.cpp
@@ -31,7 +31,6 @@
 #elif defined(CRYPTO_BACKEND_OPENSSL)
 #include <openssl/opensslv.h>
 #include <openssl/crypto.h>
-#include "ossl_common.h"
 #if defined(CRYPTO_BACKEND_OPENSSL3)
 #include <openssl/provider.h>
 #endif

diff --git a/src/lib/crypto/bn_ossl.cpp b/src/lib/crypto/bn_ossl.cpp
diff --git a/src/lib/crypto/dl_ossl.cpp b/src/lib/crypto/dl_ossl.cpp
@@ -27,10 +27,9 @@
 #include <cstdlib>
 #include <string>
 #include <cassert>
-#include "bn.h"
 #include "dl_ossl.h"
-#include "ossl_common.h"
 #include "utils.h"
+#include "ossl_utils.hpp"
 #include <openssl/dh.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
@@ -206,7 +205,8 @@ dl_validate_key(rnp::ossl::evp::PKey &pkey, const pgp::mpi *x)
     }
     int res = EVP_PKEY_param_check(ctx.get());
     if (res < 0) {
-        RNP_LOG("Param validation error: %lu (%s)", ERR_peek_last_error(), ossl_latest_err());
+        RNP_LOG(
+          "Param validation error: %lu (%s)", ERR_peek_last_error(), rnp::ossl::latest_err());
     }
     if (res < 1) {
         /* ElGamal specification doesn't seem to restrict P to the safe prime */

diff --git a/src/lib/crypto/dl_ossl.h b/src/lib/crypto/dl_ossl.h
@@ -27,12 +27,9 @@
 #ifndef DL_OSSL_H_
 #define DL_OSSL_H_
 
-#include "types.h"
-#include "config.h"
-#include <rnp/rnp_def.h>
 #include "mpi.h"
-#include "bn.h"
-#include <openssl/evp.h>
+#include <rnp/rnp_def.h>
+#include "ossl_utils.hpp"
 
 rnp::ossl::evp::PKey dl_load_key(const pgp::mpi &mp,
                                  const pgp::mpi *mq,

diff --git a/src/lib/crypto/dsa.cpp b/src/lib/crypto/dsa.cpp
@@ -31,7 +31,6 @@
 #include "botan_utils.hpp"
 #include <rnp/rnp_def.h>
 #include "dsa.h"
-#include "bn.h"
 #include "utils.h"
 
 namespace pgp {

diff --git a/src/lib/crypto/dsa_ossl.cpp b/src/lib/crypto/dsa_ossl.cpp
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <rnp/rnp_def.h>
-#include "bn.h"
 #include "dsa.h"
 #include "dl_ossl.h"
 #include "utils.h"

diff --git a/src/lib/crypto/ec.cpp b/src/lib/crypto/ec.cpp
@@ -31,7 +31,6 @@
 #include "types.h"
 #include "utils.h"
 #include "mem.h"
-#include "bn.h"
 #include "botan_utils.hpp"
 #if defined(ENABLE_CRYPTO_REFRESH) || defined(ENABLE_PQC)
 #include "x25519.h"

diff --git a/src/lib/crypto/ec_ossl.cpp b/src/lib/crypto/ec_ossl.cpp
@@ -28,11 +28,10 @@
 #include <cassert>
 #include "ec.h"
 #include "ec_ossl.h"
-#include "bn.h"
-#include "ossl_common.h"
 #include "types.h"
 #include "mem.h"
 #include "utils.h"
+#include "ossl_utils.hpp"
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/err.h>
@@ -297,7 +296,7 @@ load_key(const pgp::mpi &keyp, const pgp::mpi *keyx, pgp_curve_t curve)
         /* LCOV_EXCL_START */
         RNP_LOG("Failed to create EC key with group %s: %s",
                 curv_desc->openssl_name,
-                ossl_latest_err());
+                rnp::ossl::latest_err());
         return NULL;
         /* LCOV_EXCL_END */
     }

diff --git a/src/lib/crypto/ec_ossl.h b/src/lib/crypto/ec_ossl.h
@@ -30,7 +30,7 @@
 #include "types.h"
 #include "ec.h"
 #include <openssl/evp.h>
-#include "bn.h"
+#include "ossl_utils.hpp"
 
 namespace pgp {
 namespace ec {

diff --git a/src/lib/crypto/ecdh.cpp b/src/lib/crypto/ecdh.cpp
@@ -36,7 +36,6 @@
 #include "types.h"
 #include "utils.h"
 #include "mem.h"
-#include "bn.h"
 
 // Produces kek of size kek_len which corresponds to length of wrapping key
 static bool

diff --git a/src/lib/crypto/ecdsa.cpp b/src/lib/crypto/ecdsa.cpp
@@ -28,7 +28,6 @@
 #include "utils.h"
 #include <botan/ffi.h>
 #include <string.h>
-#include "bn.h"
 #include "botan_utils.hpp"
 
 static bool

diff --git a/src/lib/crypto/ecdsa_ossl.cpp b/src/lib/crypto/ecdsa_ossl.cpp
@@ -27,7 +27,6 @@
 #include "ecdsa.h"
 #include "utils.h"
 #include <string.h>
-#include "bn.h"
 #include "ec_ossl.h"
 #include <openssl/evp.h>
 #include <openssl/err.h>

diff --git a/src/lib/crypto/eddsa_ossl.cpp b/src/lib/crypto/eddsa_ossl.cpp
@@ -30,7 +30,7 @@
 #include "ec.h"
 #include "ec_ossl.h"
 #include "utils.h"
-#include "bn.h"
+#include "ossl_utils.hpp"
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/err.h>

diff --git a/src/lib/crypto/elgamal.cpp b/src/lib/crypto/elgamal.cpp
@@ -35,7 +35,6 @@
 #include <rnp/rnp_def.h>
 #include "elgamal.h"
 #include "utils.h"
-#include "bn.h"
 
 // Max supported key byte size
 #define ELGAMAL_MAX_P_BYTELEN BITS_TO_BYTES(PGP_MPINT_BITS)

diff --git a/src/lib/crypto/elgamal_ossl.cpp b/src/lib/crypto/elgamal_ossl.cpp
@@ -25,14 +25,14 @@
  */
 
 #include <cstdlib>
-#include <string>
+#include <cstring>
 #include <cassert>
 #include <rnp/rnp_def.h>
 #include "elgamal.h"
 #include "dl_ossl.h"
 #include "utils.h"
-#include "bn.h"
 #include "mem.h"
+#include "ossl_utils.hpp"
 #include <openssl/bn.h>
 #include <openssl/dh.h>
 #include <openssl/err.h>

diff --git a/src/lib/crypto/ossl_common.h b/src/lib/crypto/ossl_common.h