projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patches from Vern Staats <staatsvr@asc.hpc.mil> to get Kerberos 5 in
[oweals/openssl.git]
/
crypto
/
cversion.c
diff --git
a/crypto/cversion.c
b/crypto/cversion.c
index 4e823be52f9c1db3352a9e0ad0f225a4cc429c96..8ecfba7b16bac1dac3dd368589a10fbf49b0b402 100644
(file)
--- a/
crypto/cversion.c
+++ b/
crypto/cversion.c
@@
-59,40
+59,59
@@
#include <stdio.h>
#include <string.h>
#include "cryptlib.h"
#include <stdio.h>
#include <string.h>
#include "cryptlib.h"
-#include "crypto.h"
-#include "date.h"
+#include <openssl/crypto.h>
-char *SSLeay_version(t)
-int t;
+#include "buildinf.h"
+
+const char *SSLeay_version(int t)
{
if (t == SSLEAY_VERSION)
{
if (t == SSLEAY_VERSION)
- return
("SSLeay 0.9.0b 29-Jun-1998")
;
+ return
OPENSSL_VERSION_TEXT
;
if (t == SSLEAY_BUILT_ON)
{
#ifdef DATE
if (t == SSLEAY_BUILT_ON)
{
#ifdef DATE
- static char buf[sizeof(DATE)+1
0
];
+ static char buf[sizeof(DATE)+1
1
];
- sprintf(buf,"built on %s",DATE);
- return(buf);
+ sprintf(buf,"built on
:
%s",DATE);
+ return(buf);
#else
#else
- return("buil
d
date not available");
+ return("buil
t on:
date not available");
#endif
}
if (t == SSLEAY_CFLAGS)
{
#ifdef CFLAGS
#endif
}
if (t == SSLEAY_CFLAGS)
{
#ifdef CFLAGS
- static char buf[sizeof(CFLAGS)+10];
+ static char buf[sizeof(CFLAGS)+11];
+
+ sprintf(buf,"compiler: %s",CFLAGS);
+ return(buf);
+#else
+ return("compiler: information not available");
+#endif
+ }
+ if (t == SSLEAY_PLATFORM)
+ {
+#ifdef PLATFORM
+ static char buf[sizeof(PLATFORM)+11];
- sprintf(buf,"
C flags:%s",CFLAGS
);
+ sprintf(buf,"
platform: %s", PLATFORM
);
return(buf);
#else
return(buf);
#else
- return("C flags not available");
+ 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);
}