projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add GOST parameter set OIDs.
[openssl.git]
/
ssl
/
kssl.c
diff --git
a/ssl/kssl.c
b/ssl/kssl.c
index 49602bb87893067e5b0751cbd9aa7c75ad72d6f8..394ef61769618c44e908937033155b0f80c277bf 100644
(file)
--- a/
ssl/kssl.c
+++ b/
ssl/kssl.c
@@
-68,9
+68,11
@@
#include <openssl/opensslconf.h>
#include <openssl/opensslconf.h>
-#define _XOPEN_SOURCE /* glibc2 needs this to declare strptime() */
+#define _XOPEN_SOURCE
500
/* glibc2 needs this to declare strptime() */
#include <time.h>
#include <time.h>
+#if 0 /* Experimental */
#undef _XOPEN_SOURCE /* To avoid clashes with anything else... */
#undef _XOPEN_SOURCE /* To avoid clashes with anything else... */
+#endif
#include <string.h>
#define KRB5_PRIVATE 1
#include <string.h>
#define KRB5_PRIVATE 1
@@
-295,7
+297,7
@@
load_krb5_dll(void)
HANDLE hKRB5_32;
krb5_loaded++;
HANDLE hKRB5_32;
krb5_loaded++;
- hKRB5_32 = LoadLibrary(
"KRB5_32"
);
+ hKRB5_32 = LoadLibrary(
TEXT("KRB5_32")
);
if (!hKRB5_32)
return;
if (!hKRB5_32)
return;
@@
-2175,7
+2177,7
@@
krb5_error_code kssl_build_principal_2(
#else /* !OPENSSL_NO_KRB5 */
#if defined(PEDANTIC) || defined(OPENSSL_SYS_VMS)
#else /* !OPENSSL_NO_KRB5 */
#if defined(PEDANTIC) || defined(OPENSSL_SYS_VMS)
-static
int dummy=(int)
&dummy;
+static
void *dummy=
&dummy;
#endif
#endif /* !OPENSSL_NO_KRB5 */
#endif
#endif /* !OPENSSL_NO_KRB5 */