projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for WIN32 builds with KRB5
[openssl.git]
/
ssl
/
kssl.h
diff --git
a/ssl/kssl.h
b/ssl/kssl.h
index 19a689b089b7eb74199afa515e98eb71735c92e3..e4df84307313b9de402e4fde08be9a3f8e99763d 100644
(file)
--- a/
ssl/kssl.h
+++ b/
ssl/kssl.h
@@
-70,6
+70,15
@@
#include <stdio.h>
#include <ctype.h>
#include <krb5.h>
#include <stdio.h>
#include <ctype.h>
#include <krb5.h>
+#ifdef OPENSSL_SYS_WIN32
+/* These can sometimes get redefined indirectly by krb5 header files
+ * after they get undefed in ossl_typ.h
+ */
+#undef X509_NAME
+#undef X509_EXTENSIONS
+#undef OCSP_REQUEST
+#undef OCSP_RESPONSE
+#endif
#ifdef __cplusplus
extern "C" {
#ifdef __cplusplus
extern "C" {
@@
-82,6
+91,12
@@
extern "C" {
#ifdef KRB5_HEIMDAL
typedef unsigned char krb5_octet;
#define FAR
#ifdef KRB5_HEIMDAL
typedef unsigned char krb5_octet;
#define FAR
+#else
+
+#ifndef FAR
+#define FAR
+#endif
+
#endif
/* Uncomment this to debug kssl problems or
#endif
/* Uncomment this to debug kssl problems or
@@
-166,6
+181,10
@@
krb5_error_code kssl_check_authent(KSSL_CTX *kssl_ctx, krb5_data *authentp,
krb5_timestamp *atimep, KSSL_ERR *kssl_err);
unsigned char *kssl_skip_confound(krb5_enctype enctype, unsigned char *authn);
krb5_timestamp *atimep, KSSL_ERR *kssl_err);
unsigned char *kssl_skip_confound(krb5_enctype enctype, unsigned char *authn);
+void SSL_set0_kssl_ctx(SSL *s, KSSL_CTX *kctx);
+KSSL_CTX * SSL_get0_kssl_ctx(SSL *s);
+char *kssl_ctx_get0_client_princ(KSSL_CTX *kctx);
+
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
}
#endif