projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include "constant_time_locl.h" rather than "../constant_time_locl.h".
[oweals/openssl.git]
/
crypto
/
cversion.c
diff --git
a/crypto/cversion.c
b/crypto/cversion.c
index 3933a0c37a1a8ed1f6febbbaa3ecdd2fcfaa12bc..ea9f25fd16663dc93d9290ea19358db066c4861d 100644
(file)
--- a/
crypto/cversion.c
+++ b/
crypto/cversion.c
@@
-56,14
+56,13
@@
* [including the GNU Public Licence.]
*/
* [including the GNU Public Licence.]
*/
-#include <stdio.h>
-#include <string.h>
#include "cryptlib.h"
#include "cryptlib.h"
-#include "crypto.h"
-#include "date.h"
-const char *SSLeay_version(t)
-int t;
+#ifndef NO_WINDOWS_BRAINDEATH
+#include "buildinf.h"
+#endif
+
+const char *SSLeay_version(int t)
{
if (t == SSLEAY_VERSION)
return OPENSSL_VERSION_TEXT;
{
if (t == SSLEAY_VERSION)
return OPENSSL_VERSION_TEXT;
@@
-72,8
+71,8
@@
int t;
#ifdef DATE
static char buf[sizeof(DATE)+11];
#ifdef DATE
static char buf[sizeof(DATE)+11];
-
sprintf(
buf,"built on: %s",DATE);
- return(buf);
+
BIO_snprintf(buf,sizeof
buf,"built on: %s",DATE);
+ return(buf);
#else
return("built on: date not available");
#endif
#else
return("built on: date not available");
#endif
@@
-83,7
+82,7
@@
int t;
#ifdef CFLAGS
static char buf[sizeof(CFLAGS)+11];
#ifdef CFLAGS
static char buf[sizeof(CFLAGS)+11];
-
sprintf(
buf,"compiler: %s",CFLAGS);
+
BIO_snprintf(buf,sizeof
buf,"compiler: %s",CFLAGS);
return(buf);
#else
return("compiler: information not available");
return(buf);
#else
return("compiler: information not available");
@@
-94,16
+93,24
@@
int t;
#ifdef PLATFORM
static char buf[sizeof(PLATFORM)+11];
#ifdef PLATFORM
static char buf[sizeof(PLATFORM)+11];
-
sprintf(
buf,"platform: %s", PLATFORM);
+
BIO_snprintf(buf,sizeof
buf,"platform: %s", PLATFORM);
return(buf);
#else
return("platform: information not available");
return(buf);
#else
return("platform: information not available");
+#endif
+ }
+ if (t == SSLEAY_DIR)
+ {
+#ifdef OPENSSLDIR
+ return "OPENSSLDIR: \"" OPENSSLDIR "\"";
+#else
+ return "OPENSSLDIR: N/A";
#endif
}
return("not available");
}
#endif
}
return("not available");
}
-unsigned long SSLeay()
+unsigned long SSLeay(
void
)
{
return(SSLEAY_VERSION_NUMBER);
}
{
return(SSLEAY_VERSION_NUMBER);
}