add MSDOS via DJGPP support

UMSKT · Feb 21, 2024 · 715ebca · 715ebca
1 parent 843d74c
commit 715ebca
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 5 deletions.
diff --git a/config_align.h b/config_align.h
@@ -57,8 +57,10 @@
 // IBM XL C/C++ alignment modifier per Optimization Guide, pp. 19-20.
 // __IBM_ATTRIBUTES per XLC 12.1 AIX Compiler Manual, p. 473.
 // CRYPTOPP_ALIGN_DATA may not be reliable on AIX.
-#if defined(CRYPTOPP_CXX11_ALIGNAS)
+#if defined(CRYPTOPP_CXX11_ALIGNAS) && !defined(__DJGPP__)
  #define CRYPTOPP_ALIGN_DATA(x) alignas(x)
+#elif defined(__DJGPP__)
+ #define CRYPTOPP_ALIGN_DATA(x)
 #elif defined(CRYPTOPP_MSC_VERSION)
  #define CRYPTOPP_ALIGN_DATA(x) __declspec(align(x))
 #elif defined(__GNUC__) || defined(__clang__) || (__SUNPRO_CC >= 0x5100)

diff --git a/config_asm.h b/config_asm.h
@@ -69,6 +69,11 @@
 # define CRYPTOPP_DISABLE_ASM 1
 #endif
 
+// DJGPP is designed to support legacy intel processors, SSE2 is certainly not available
+#if defined(__DJGPP__)
+# define CRYPTOPP_DISABLE_ASM 1
+#endif
+
 // Sun Studio 12.1 provides GCC inline assembly
 // http://blogs.oracle.com/x86be/entry/gcc_style_asm_inlining_support
 #if defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x5100)

diff --git a/config_os.h b/config_os.h
@@ -48,6 +48,11 @@
 #define CRYPTOPP_BSD_AVAILABLE
 #endif
 
+// MSDOS via DJGPP
+#if defined(__DJGPP__)
+#define CRYPTOPP_DJGPP_AVAILABLE
+#endif
+
 // Microsoft compilers
 #if defined(CRYPTOPP_MSC_VERSION) || defined(__fastcall)
  #define CRYPTOPP_FASTCALL __fastcall
@@ -121,7 +126,7 @@
 # endif
 #endif // CRYPTOPP_INIT_PRIORITY, NO_OS_DEPENDENCE, Apple, Sun
 
-#if defined(CRYPTOPP_WIN32_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE)
+#if defined(CRYPTOPP_WIN32_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE) || defined(CRYPTOPP_DJGPP_AVAILABLE)
 # define HIGHRES_TIMER_AVAILABLE
 #endif
 
@@ -135,7 +140,7 @@
 # endif
 #endif
 
-#if defined(CRYPTOPP_UNIX_AVAILABLE) || defined(CRYPTOPP_DOXYGEN_PROCESSING)
+#if defined(CRYPTOPP_UNIX_AVAILABLE) || defined(CRYPTOPP_DOXYGEN_PROCESSING) || defined(CRYPTOPP_DJGPP_AVAILABLE)
 # define NONBLOCKING_RNG_AVAILABLE
 # define BLOCKING_RNG_AVAILABLE
 # define OS_RNG_AVAILABLE

diff --git a/hrtimer.cpp b/hrtimer.cpp
@@ -99,6 +99,8 @@ TimerWord Timer::GetCurrentTimerValue()
  timeval now;
  gettimeofday(&now, NULLPTR);
  return (TimerWord)now.tv_sec * 1000000 + now.tv_usec;
+#elif defined(CRYPTOPP_DJGPP_AVAILABLE)
+ return uclock();
 #else
  // clock_t now;
  return clock();
@@ -111,6 +113,8 @@ TimerWord Timer::TicksPerSecond()
  return PerformanceCounterFrequency();
 #elif defined(CRYPTOPP_UNIX_AVAILABLE)
  return 1000000;
+#elif defined(CRYPTOPP_DJGPP_AVAILABLE)
+ return UCLOCKS_PER_SEC;
 #else
  return CLOCKS_PER_SEC;
 #endif
@@ -151,6 +155,8 @@ TimerWord ThreadUserTimer::GetCurrentTimerValue()
  tms now;
  times(&now);
  return now.tms_utime;
+#elif defined(CRYPTOPP_DJGPP_AVAILABLE)
+ return uclock();
 #else
  return clock();
 #endif
@@ -166,6 +172,8 @@ TimerWord ThreadUserTimer::TicksPerSecond()
 #elif defined(CRYPTOPP_UNIX_AVAILABLE)
  static const long ticksPerSecond = sysconf(_SC_CLK_TCK);
  return ticksPerSecond;
+#elif defined(CRYPTOPP_DJGPP_AVAILABLE)
+ return UCLOCKS_PER_SEC;
 #else
  return CLOCKS_PER_SEC;
 #endif

diff --git a/osrng.cpp b/osrng.cpp
@@ -163,9 +163,17 @@ NonblockingRng::NonblockingRng()
  const int flags = O_RDONLY;
 # endif
 
- m_fd = open("/dev/urandom", flags);
+# ifndef CRYPTOPP_NONBLOCKING_RNG_FILENAME
+# if !defined(CRYPTOPP_DJGPP_AVAILABLE)
+# define CRYPTOPP_NONBLOCKING_RNG_FILENAME "/dev/urandom"
+# else
+# define CRYPTOPP_NONBLOCKING_RNG_FILENAME "/dev/urandom\x24"
+# endif
+# endif
+
+ m_fd = open(CRYPTOPP_NONBLOCKING_RNG_FILENAME, flags);
  if (m_fd == -1)
- throw OS_RNG_Err("open /dev/urandom");
+ throw OS_RNG_Err("open " CRYPTOPP_NONBLOCKING_RNG_FILENAME);
 
 #endif
 }
@@ -250,6 +258,8 @@ void NonblockingRng::GenerateBlock(byte *output, size_t size)
 #ifndef CRYPTOPP_BLOCKING_RNG_FILENAME
 # ifdef __OpenBSD__
 # define CRYPTOPP_BLOCKING_RNG_FILENAME "/dev/srandom"
+# elif defined(CRYPTOPP_DJGPP_AVAILABLE)
+# define CRYPTOPP_BLOCKING_RNG_FILENAME "/dev/random\x24"
 # else
 # define CRYPTOPP_BLOCKING_RNG_FILENAME "/dev/random"
 # endif