attempt to fix ossl 1.0.2 build by moving ifndef to opensslshim.h

dotnet · Jul 19, 2024 · 691fb50 · 691fb50
1 parent 5b5fd6c
commit 691fb50
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/native/libs/System.Security.Cryptography.Native/opensslshim.h b/src/native/libs/System.Security.Cryptography.Native/opensslshim.h
@@ -91,6 +91,10 @@ void ERR_put_error(int32_t lib, int32_t func, int32_t reason, const char* file,
 #define RSA_PSS_SALTLEN_DIGEST -1
 #endif
 
+#ifndef EVP_PKEY_RSA_PSS
+#define EVP_PKEY_RSA_PSS 912
+#endif
+
 // ERR_R_UNSUPPORTED was introduced in OpenSSL 3. We need it for building with older OpenSSLs.
 // Add a static assert so we know if OpenSSL changes the value.
 #ifndef ERR_R_UNSUPPORTED

diff --git a/src/native/libs/System.Security.Cryptography.Native/osslcompat_30.h b/src/native/libs/System.Security.Cryptography.Native/osslcompat_30.h
@@ -20,10 +20,6 @@
 #define OSSL_STORE_INFO_PKEY 4
 #define OSSL_STORE_INFO_PUBKEY 3
 
-#ifndef EVP_PKEY_RSA_PSS
-#define EVP_PKEY_RSA_PSS 912
-#endif
-
 typedef struct ossl_lib_ctx_st OSSL_LIB_CTX;
 typedef struct ossl_param_st OSSL_PARAM;
 typedef struct ossl_provider_st OSSL_PROVIDER;