Fix length checks in X509_cmp_time to avoid out-of-bounds reads.

[openssl.git] / crypto / uid.c

diff --git a/crypto/uid.c b/crypto/uid.c
index 2afed36331c9fd7e24cec956222c3a602bacab49..90694c6725fcc3ac949cd074489b65073fcdf733 100644 (file)
--- a/crypto/uid.c
+++ b/crypto/uid.c
@@ -7,7 +7,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -53,36 +53,36 @@
  *
  */
 
-#include "openssl/crypto.h"
+#include <openssl/crypto.h>
+#include <openssl/opensslconf.h>
 
 #if defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ > 2)
 
-#include <unistd.h>
+# include OPENSSL_UNISTD
 
 int OPENSSL_issetugid(void)
-       {
-       return issetugid();
-       }
+{
+    return issetugid();
+}
 
-#elsif defined(WIN32)
+#elif defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE)
 
 int OPENSSL_issetugid(void)
-       {
-       return 0;
-       }
+{
+    return 0;
+}
 
 #else
 
-#include <unistd.h>
-#include <sys/types.h>
+# include OPENSSL_UNISTD
+# include <sys/types.h>
 
 int OPENSSL_issetugid(void)
-       {
-       if (getuid() != geteuid()) return 1;
-       if (getgid() != getegid()) return 1;
-       return 0;
-       }
+{
+    if (getuid() != geteuid())
+        return 1;
+    if (getgid() != getegid())
+        return 1;
+    return 0;
+}
 #endif
-
-
-