Expose OpenSSL wrappers (#6895)

achamayou · web-flow · commit cb2e3c6c3503 · 2025-03-11T14:20:42.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 [6.0.0-rc1]: https://github.com/microsoft/CCF/releases/tag/6.0.0-rc1
 
+### Changed
+
+- `ccf/crypto/openssl/openssl_wrappers.h` is now exposed.
+
 ### Added
 
 - The `read-ledger.py` tool now has a `--recovery` argument, which will allow it to parse `.recovery` files. Previously these were ignored (#6896).
diff --git a/include/ccf/crypto/openssl/openssl_wrappers.h b/include/ccf/crypto/openssl/openssl_wrappers.h
diff --git a/src/clients/tls_client.h b/src/clients/tls_client.h
@@ -2,8 +2,8 @@
 // Licensed under the Apache 2.0 License.
 #pragma once
 
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "ccf/ds/logger.h"
-#include "crypto/openssl/openssl_wrappers.h"
 #include "tls/ca.h"
 #include "tls/cert.h"
 
diff --git a/src/crypto/csr.h b/src/crypto/csr.h
@@ -2,8 +2,8 @@
 // Licensed under the Apache 2.0 License.
 #pragma once
 
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "ccf/crypto/pem.h"
-#include "crypto/openssl/openssl_wrappers.h"
 
 #include <openssl/bio.h>
 
diff --git a/src/crypto/ecdsa.cpp b/src/crypto/ecdsa.cpp
@@ -2,7 +2,7 @@
 // Licensed under the Apache 2.0 License.
 #include "ccf/crypto/ecdsa.h"
 
-#include "crypto/openssl/openssl_wrappers.h"
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "crypto/openssl/public_key.h"
 
 #include <openssl/bn.h>
diff --git a/src/crypto/key_exchange.h b/src/crypto/key_exchange.h
@@ -3,8 +3,8 @@
 #pragma once
 
 #include "ccf/crypto/key_pair.h"
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "ccf/ds/logger.h"
-#include "crypto/openssl/openssl_wrappers.h"
 #include "crypto/openssl/public_key.h"
 
 #include <iostream>
diff --git a/src/crypto/openssl/base64.h b/src/crypto/openssl/base64.h
@@ -2,8 +2,8 @@
 // Licensed under the Apache 2.0 License.
 #pragma once
 
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "ccf/ds/logger.h"
-#include "crypto/openssl/openssl_wrappers.h"
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
diff --git a/src/crypto/openssl/cose_verifier.cpp b/src/crypto/openssl/cose_verifier.cpp
@@ -3,10 +3,10 @@
 
 #include "crypto/openssl/cose_verifier.h"
 
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "ccf/crypto/public_key.h"
 #include "ccf/ds/logger.h"
 #include "crypto/openssl/cose_sign.h"
-#include "crypto/openssl/openssl_wrappers.h"
 #include "crypto/openssl/rsa_key_pair.h"
 #include "x509_time.h"
 
diff --git a/src/crypto/openssl/cose_verifier.h b/src/crypto/openssl/cose_verifier.h
@@ -3,9 +3,9 @@
 #pragma once
 
 #include "ccf/crypto/cose_verifier.h"
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "ccf/crypto/rsa_key_pair.h"
 #include "ccf/crypto/verifier.h"
-#include "crypto/openssl/openssl_wrappers.h"
 #include "crypto/openssl/public_key.h"
 
 #include <chrono>
diff --git a/src/crypto/openssl/eddsa_key_pair.cpp b/src/crypto/openssl/eddsa_key_pair.cpp
@@ -3,7 +3,7 @@
 
 #include "crypto/openssl/eddsa_key_pair.h"
 
-#include "openssl_wrappers.h"
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 
 namespace ccf::crypto
 {
diff --git a/src/crypto/openssl/eddsa_key_pair.h b/src/crypto/openssl/eddsa_key_pair.h
@@ -3,8 +3,8 @@
 #pragma once
 
 #include "ccf/crypto/eddsa_key_pair.h"
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "crypto/openssl/eddsa_public_key.h"
-#include "openssl_wrappers.h"
 
 namespace ccf::crypto
 {
diff --git a/src/crypto/openssl/eddsa_public_key.cpp b/src/crypto/openssl/eddsa_public_key.cpp
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the Apache 2.0 License.
 
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "crypto/openssl/eddsa_key_pair.h"
 #include "crypto/openssl/hash.h"
-#include "openssl_wrappers.h"
 
 namespace ccf::crypto
 {
diff --git a/src/crypto/openssl/entropy.h b/src/crypto/openssl/entropy.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "ccf/crypto/entropy.h"
-#include "openssl_wrappers.h"
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 
 #include <functional>
 #include <memory>
diff --git a/src/crypto/openssl/hash.h b/src/crypto/openssl/hash.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "ccf/crypto/hash_provider.h"
-#include "openssl_wrappers.h"
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 
 #include <openssl/evp.h>
 #include <openssl/kdf.h>
diff --git a/src/crypto/openssl/key_pair.cpp b/src/crypto/openssl/key_pair.cpp
@@ -4,9 +4,9 @@
 #include "crypto/openssl/key_pair.h"
 
 #include "ccf/crypto/curve.h"
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "crypto/openssl/hash.h"
 #include "crypto/openssl/public_key.h"
-#include "openssl_wrappers.h"
 #include "x509_time.h"
 
 #define FMT_HEADER_ONLY
diff --git a/src/crypto/openssl/key_pair.h b/src/crypto/openssl/key_pair.h
@@ -3,9 +3,9 @@
 #pragma once
 
 #include "ccf/crypto/key_pair.h"
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "ccf/crypto/public_key.h"
 #include "crypto/openssl/public_key.h"
-#include "openssl_wrappers.h"
 
 #include <optional>
 #include <stdexcept>
diff --git a/src/crypto/openssl/public_key.cpp b/src/crypto/openssl/public_key.cpp
@@ -3,9 +3,9 @@
 
 #include "crypto/openssl/public_key.h"
 
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "ccf/ds/logger.h"
 #include "crypto/openssl/hash.h"
-#include "openssl_wrappers.h"
 
 #include <openssl/ec.h>
 #include <openssl/engine.h>
diff --git a/src/crypto/openssl/public_key.h b/src/crypto/openssl/public_key.h
@@ -2,8 +2,8 @@
 // Licensed under the Apache 2.0 License.
 #pragma once
 
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "ccf/crypto/public_key.h"
-#include "openssl_wrappers.h"
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
diff --git a/src/crypto/openssl/rsa_key_pair.cpp b/src/crypto/openssl/rsa_key_pair.cpp
@@ -3,8 +3,8 @@
 
 #include "crypto/openssl/rsa_key_pair.h"
 
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "crypto/openssl/hash.h"
-#include "openssl_wrappers.h"
 
 #if defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 3
 #  include <openssl/core_names.h>
diff --git a/src/crypto/openssl/rsa_public_key.cpp b/src/crypto/openssl/rsa_public_key.cpp
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the Apache 2.0 License.
 
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "crypto/openssl/hash.h"
 #include "crypto/openssl/rsa_key_pair.h"
-#include "openssl_wrappers.h"
 
 #if defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 3
 #  include <openssl/core_names.h>
diff --git a/src/crypto/openssl/symmetric_key.cpp b/src/crypto/openssl/symmetric_key.cpp
@@ -3,9 +3,9 @@
 
 #include "crypto/openssl/symmetric_key.h"
 
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "ccf/crypto/symmetric_key.h"
 #include "ccf/ds/logger.h"
-#include "crypto/openssl/openssl_wrappers.h"
 #include "ds/thread_messaging.h"
 
 #include <openssl/aes.h>
diff --git a/src/crypto/openssl/symmetric_key.h b/src/crypto/openssl/symmetric_key.h
@@ -2,8 +2,8 @@
 // Licensed under the Apache 2.0 License.
 #pragma once
 
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "ccf/crypto/symmetric_key.h"
-#include "openssl_wrappers.h"
 
 #include <openssl/crypto.h>
 
diff --git a/src/crypto/openssl/verifier.cpp b/src/crypto/openssl/verifier.cpp
@@ -3,9 +3,9 @@
 
 #include "crypto/openssl/verifier.h"
 
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "ccf/crypto/public_key.h"
 #include "ccf/ds/logger.h"
-#include "crypto/openssl/openssl_wrappers.h"
 #include "crypto/openssl/rsa_key_pair.h"
 #include "x509_time.h"
 
diff --git a/src/crypto/openssl/verifier.h b/src/crypto/openssl/verifier.h
@@ -2,8 +2,8 @@
 // Licensed under the Apache 2.0 License.
 #pragma once
 
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "ccf/crypto/verifier.h"
-#include "crypto/openssl/openssl_wrappers.h"
 
 #include <chrono>
 #include <openssl/x509.h>
diff --git a/src/crypto/openssl/x509_time.h b/src/crypto/openssl/x509_time.h
@@ -2,8 +2,8 @@
 // Licensed under the Apache 2.0 License.
 #pragma once
 
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "ccf/ds/x509_time_fmt.h"
-#include "openssl_wrappers.h"
 
 #include <openssl/asn1.h>
 
diff --git a/src/tls/ca.h b/src/tls/ca.h
@@ -2,8 +2,8 @@
 // Licensed under the Apache 2.0 License.
 #pragma once
 
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "ccf/crypto/pem.h"
-#include "crypto/openssl/openssl_wrappers.h"
 
 #include <exception>
 
diff --git a/src/tls/cert.h b/src/tls/cert.h
@@ -2,8 +2,8 @@
 // Licensed under the Apache 2.0 License.
 #pragma once
 
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "crypto/openssl/key_pair.h"
-#include "crypto/openssl/openssl_wrappers.h"
 #include "tls/ca.h"
 
 #include <cstring>
diff --git a/src/tls/tls.h b/src/tls/tls.h
@@ -23,7 +23,7 @@
 // Once we refactor the code to match the OpenSSL style we may not need this.
 #define TLS_ERR_X509_VERIFY INT_MIN
 
-#include "crypto/openssl/openssl_wrappers.h"
+#include "ccf/crypto/openssl/openssl_wrappers.h"
 
 #include <string>
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`#include "crypto/openssl/eddsa_key_pair.h"`
`5`	`5`
`6`		`-#include "openssl_wrappers.h"`
	`6`	`+#include "ccf/crypto/openssl/openssl_wrappers.h"`
`7`	`7`
`8`	`8`	`namespace ccf::crypto`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`#pragma once`
`4`	`4`
`5`	`5`	`#include "ccf/crypto/eddsa_key_pair.h"`
	`6`	`+#include "ccf/crypto/openssl/openssl_wrappers.h"`
`6`	`7`	`#include "crypto/openssl/eddsa_public_key.h"`
`7`		`-#include "openssl_wrappers.h"`
`8`	`8`
`9`	`9`	`namespace ccf::crypto`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`// Copyright (c) Microsoft Corporation. All rights reserved.`
`2`	`2`	`// Licensed under the Apache 2.0 License.`
`3`	`3`
	`4`	`+#include "ccf/crypto/openssl/openssl_wrappers.h"`
`4`	`5`	`#include "crypto/openssl/eddsa_key_pair.h"`
`5`	`6`	`#include "crypto/openssl/hash.h"`
`6`		`-#include "openssl_wrappers.h"`
`7`	`7`
`8`	`8`	`namespace ccf::crypto`
`9`	`9`	`{`