Support tempfile creation in ssl_test

aws · Mar 22, 2024 · d4b3a4c · d4b3a4c
1 parent 2d2e86d
commit d4b3a4c
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 25 deletions.
diff --git a/crypto/test/test_util.cc b/crypto/test/test_util.cc
@@ -88,28 +88,31 @@ bssl::UniquePtr<X509> CertFromPEM(const char *pem) {
 }
 
 #if defined(OPENSSL_WINDOWS)
-#include <windows.h>
-#ifndef PATH_MAX
-#define PATH_MAX MAX_PATH
-#endif
-#include <fileapi.h>
-FILE* createRawTempFILE() {
+size_t createTempFILEpath(char buffer[PATH_MAX]) {
+  // On Windows, tmpfile() may attempt to create temp files in the root directory
+  // of the drive, which requires Admin privileges, resulting in test failure.
   char pathname[PATH_MAX];
   if(0 == GetTempPathA(PATH_MAX, pathname)) {
-    return nullptr;
+    return 0;
   }
+  return GetTempFileNameA(pathname, "awslctest", 0, buffer);
+}
+#else
+size_t createTempFILEpath(char buffer[PATH_MAX]) {
+  if(tmpnam(buffer) == nullptr) {
+    return 0;
+  }
+  return strnlen(buffer, PATH_MAX);
+}
+#endif
+
+FILE* createRawTempFILE() {
   char filename[PATH_MAX];
-  if(0 == GetTempFileNameA(pathname, "awslctest", 0, filename)) {
+  if(createTempFILEpath(filename) == 0) {
     return nullptr;
   }
   return fopen(filename, "w+b");
 }
-#else
-#include <stdio.h>
-FILE* createRawTempFILE() {
-  return tmpfile();
-}
-#endif
 
 TempFILE createTempFILE() {
   return TempFILE(createRawTempFILE());

diff --git a/crypto/test/test_util.h b/crypto/test/test_util.h
@@ -82,6 +82,16 @@ struct FileCloser {
 
 using TempFILE = std::unique_ptr<FILE, FileCloser>;
 
+#if defined(OPENSSL_WINDOWS)
+#include <windows.h>
+#ifndef PATH_MAX
+#define PATH_MAX MAX_PATH
+#endif
+#else
+#include <limits.h>
+#endif
+
+size_t createTempFILEpath(char buffer[PATH_MAX]);
 FILE* createRawTempFILE();
 TempFILE createTempFILE();
 

diff --git a/ssl/ssl_test.cc b/ssl/ssl_test.cc
@@ -12111,17 +12111,10 @@ TEST(SSLTest, SSLFileTests) {
 
   using ScopedFILE = std::unique_ptr<FILE, FileCloser>;
 
-#if defined(OPENSSL_WINDOWS)
-  char rsa_pem_filename[FILENAME_MAX];
-  char ecdsa_pem_filename[FILENAME_MAX];
-  ASSERT_EQ(tmpnam_s(rsa_pem_filename, FILENAME_MAX), 0);
-  ASSERT_EQ(tmpnam_s(ecdsa_pem_filename, FILENAME_MAX), 0);
-#else
-  char rsa_pem_filename[] = "/tmp/fileXXXXXX";
-  char ecdsa_pem_filename[] = "/tmp/fileXXXXXX";
-  ASSERT_TRUE(mkstemp(rsa_pem_filename));
-  ASSERT_TRUE(mkstemp(ecdsa_pem_filename));
-#endif
+  char rsa_pem_filename[PATH_MAX];
+  char ecdsa_pem_filename[PATH_MAX];
+  ASSERT_TRUE(createTempFILEpath(rsa_pem_filename));
+  ASSERT_TRUE(createTempFILEpath(ecdsa_pem_filename));
 
   ScopedFILE rsa_pem(fopen(rsa_pem_filename, "w"));
   ScopedFILE ecdsa_pem(fopen(ecdsa_pem_filename, "w"));