Import Heimdal 7.5.0.vendor/heimdal/7.5.0vendor/heimdal

18 files changed, 164 insertions, 310 deletions

diff --git a/doc/doxyout/ntlm/man/man3/challenge.3 b/doc/doxyout/ntlm/man/man3/challenge.3
deleted file mode 100644
index a7659b3d1feb..000000000000
--- a/doc/doxyout/ntlm/man/man3/challenge.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/ntlm_type2.3
diff --git a/doc/doxyout/ntlm/man/man3/context.3 b/doc/doxyout/ntlm/man/man3/context.3
deleted file mode 100644
index a7659b3d1feb..000000000000
--- a/doc/doxyout/ntlm/man/man3/context.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/ntlm_type2.3
diff --git a/doc/doxyout/ntlm/man/man3/domain.3 b/doc/doxyout/ntlm/man/man3/domain.3
deleted file mode 100644
index d1020b43b40d..000000000000
--- a/doc/doxyout/ntlm/man/man3/domain.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/ntlm_type1.3
diff --git a/doc/doxyout/ntlm/man/man3/flags.3 b/doc/doxyout/ntlm/man/man3/flags.3
deleted file mode 100644
index d1020b43b40d..000000000000
--- a/doc/doxyout/ntlm/man/man3/flags.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/ntlm_type1.3
diff --git a/doc/doxyout/ntlm/man/man3/hostname.3 b/doc/doxyout/ntlm/man/man3/hostname.3
deleted file mode 100644
index d1020b43b40d..000000000000
--- a/doc/doxyout/ntlm/man/man3/hostname.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/ntlm_type1.3
diff --git a/doc/doxyout/ntlm/man/man3/lm.3 b/doc/doxyout/ntlm/man/man3/lm.3
deleted file mode 100644
index de392aede5fd..000000000000
--- a/doc/doxyout/ntlm/man/man3/lm.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/ntlm_type3.3
diff --git a/doc/doxyout/ntlm/man/man3/ntlm.3 b/doc/doxyout/ntlm/man/man3/ntlm.3
deleted file mode 100644
index de392aede5fd..000000000000
--- a/doc/doxyout/ntlm/man/man3/ntlm.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/ntlm_type3.3
diff --git a/doc/doxyout/ntlm/man/man3/ntlm_buf.3 b/doc/doxyout/ntlm/man/man3/ntlm_buf.3
index 9077d5b23846..270e5a50e0bd 100644
--- a/doc/doxyout/ntlm/man/man3/ntlm_buf.3
+++ b/doc/doxyout/ntlm/man/man3/ntlm_buf.3
@@ -1,13 +1,13 @@
-.TH "ntlm_buf" 3 "11 Jan 2012" "Version 1.5.2" "Heimdalntlmlibrary" \" -*- nroff -*-
+.TH "ntlm_buf" 3 "Fri Dec 8 2017" "Version 7.5.0" "Heimdalntlmlibrary" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
-ntlm_buf \- 
+ntlm_buf
 .SH SYNOPSIS
 .br
 .PP
-\fC#include <heimntlm.h>\fP
 .PP
+\fC#include <heimntlm\&.h>\fP
 .SS "Data Fields"
 
 .in +1c
@@ -20,29 +20,26 @@ ntlm_buf \-
 .in -1c
 .SH "Detailed Description"
 .PP 
-Buffer for storing data in the NTLM library. When filled in by the library it should be freed with \fBheim_ntlm_free_buf()\fP. 
+Buffer for storing data in the NTLM library\&. When filled in by the library it should be freed with \fBheim_ntlm_free_buf()\fP\&. 
 .PP
 \fBExamples: \fP
 .in +1c
-.PP
-\fBtest_ntlm.c\fP.
+\fBtest_ntlm\&.c\fP\&.
 .SH "Field Documentation"
 .PP 
-.SS "size_t \fBntlm_buf::length\fP"
-.PP
-length buffer data 
+.SS "void* ntlm_buf::data"
+pointer to the data itself 
 .PP
 \fBExamples: \fP
 .in +1c
-\fBtest_ntlm.c\fP.
-.SS "void* \fBntlm_buf::data\fP"
-.PP
-pointer to the data itself 
+\fBtest_ntlm\&.c\fP\&.
+.SS "size_t ntlm_buf::length"
+length buffer data 
 .PP
 \fBExamples: \fP
 .in +1c
-\fBtest_ntlm.c\fP.
+\fBtest_ntlm\&.c\fP\&.
 
 .SH "Author"
 .PP 
-Generated automatically by Doxygen for Heimdalntlmlibrary from the source code.
+Generated automatically by Doxygen for Heimdalntlmlibrary from the source code\&.
diff --git a/doc/doxyout/ntlm/man/man3/ntlm_core.3 b/doc/doxyout/ntlm/man/man3/ntlm_core.3
index 5341cc0c7079..5a9f5fafe8bb 100644
--- a/doc/doxyout/ntlm/man/man3/ntlm_core.3
+++ b/doc/doxyout/ntlm/man/man3/ntlm_core.3
@@ -1,8 +1,11 @@
-.TH "Heimdal NTLM library" 3 "11 Jan 2012" "Version 1.5.2" "Heimdalntlmlibrary" \" -*- nroff -*-
+.TH "ntlm_core" 3 "Fri Dec 8 2017" "Version 7.5.0" "Heimdalntlmlibrary" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
-Heimdal NTLM library \- 
+ntlm_core
+.SH SYNOPSIS
+.br
+.PP
 .SS "Functions"
 
 .in +1c
@@ -34,7 +37,7 @@ Heimdal NTLM library \-
 .RI "void \fBheim_ntlm_free_type3\fP (struct \fBntlm_type3\fP *data)"
 .br
 .ti -1c
-.RI "int \fBheim_ntlm_encode_type3\fP (const struct \fBntlm_type3\fP *type3, struct \fBntlm_buf\fP *data)"
+.RI "int \fBheim_ntlm_encode_type3\fP (const struct \fBntlm_type3\fP *type3, struct \fBntlm_buf\fP *data, size_t *mic_offset)"
 .br
 .ti -1c
 .RI "int \fBheim_ntlm_nt_key\fP (const char *password, struct \fBntlm_buf\fP *key)"
@@ -52,7 +55,7 @@ Heimdal NTLM library \-
 .RI "int \fBheim_ntlm_keyex_unwrap\fP (struct \fBntlm_buf\fP *baseKey, struct \fBntlm_buf\fP *encryptedSession, struct \fBntlm_buf\fP *session)"
 .br
 .ti -1c
-.RI "int \fBheim_ntlm_ntlmv2_key\fP (const void *key, size_t len, const char *username, const char *target, unsigned char ntlmv2[16])"
+.RI "int \fBheim_ntlm_ntlmv2_key\fP (const void *key, size_t len, const char *username, const char *target, int upper_case_target, unsigned char ntlmv2[16])"
 .br
 .ti -1c
 .RI "int \fBheim_ntlm_calculate_lm2\fP (const void *key, size_t len, const char *username, const char *target, const unsigned char serverchallenge[8], unsigned char ntlmv2[16], struct \fBntlm_buf\fP *answer)"
@@ -66,12 +69,11 @@ Heimdal NTLM library \-
 .in -1c
 .SH "Detailed Description"
 .PP 
-The NTLM core functions implement the string2key generation function, message encode and decode function, and the hash function functions. 
+The NTLM core functions implement the string2key generation function, message encode and decode function, and the hash function functions\&. 
 .SH "Function Documentation"
 .PP 
 .SS "int heim_ntlm_build_ntlm1_master (void * key, size_t len, struct \fBntlm_buf\fP * session, struct \fBntlm_buf\fP * master)"
-.PP
-Generates an NTLMv1 session random with assosited session master key.
+Generates an NTLMv1 session random with assosited session master key\&.
 .PP
 \fBParameters:\fP
 .RS 4
@@ -79,20 +81,19 @@ Generates an NTLMv1 session random with assosited session master key.
 .br
 \fIlen\fP length of key 
 .br
-\fIsession\fP generated session nonce, should be freed with \fBheim_ntlm_free_buf()\fP. 
+\fIsession\fP generated session nonce, should be freed with \fBheim_ntlm_free_buf()\fP\&. 
 .br
-\fImaster\fP calculated session master key, should be freed with \fBheim_ntlm_free_buf()\fP.
+\fImaster\fP calculated session master key, should be freed with \fBheim_ntlm_free_buf()\fP\&.
 .RE
 .PP
 \fBReturns:\fP
 .RS 4
-In case of success 0 is return, an errors, a errno in what went wrong. 
+In case of success 0 is return, an errors, a errno in what went wrong\&. 
 .RE
 .PP
 
 .SS "int heim_ntlm_build_ntlm2_master (void * key, size_t len, struct \fBntlm_buf\fP * blob, struct \fBntlm_buf\fP * session, struct \fBntlm_buf\fP * master)"
-.PP
-Generates an NTLMv2 session random with associated session master key.
+Generates an NTLMv2 session random with associated session master key\&.
 .PP
 \fBParameters:\fP
 .RS 4
@@ -102,19 +103,18 @@ Generates an NTLMv2 session random with associated session master key.
 .br
 \fIblob\fP the NTLMv2 'blob' 
 .br
-\fIsession\fP generated session nonce, should be freed with \fBheim_ntlm_free_buf()\fP. 
+\fIsession\fP generated session nonce, should be freed with \fBheim_ntlm_free_buf()\fP\&. 
 .br
-\fImaster\fP calculated session master key, should be freed with \fBheim_ntlm_free_buf()\fP.
+\fImaster\fP calculated session master key, should be freed with \fBheim_ntlm_free_buf()\fP\&.
 .RE
 .PP
 \fBReturns:\fP
 .RS 4
-In case of success 0 is return, an errors, a errno in what went wrong. 
+In case of success 0 is return, an errors, a errno in what went wrong\&. 
 .RE
 .PP
 
 .SS "int heim_ntlm_calculate_lm2 (const void * key, size_t len, const char * username, const char * target, const unsigned char serverchallenge[8], unsigned char ntlmv2[16], struct \fBntlm_buf\fP * answer)"
-.PP
 Calculate LMv2 response
 .PP
 \fBParameters:\fP
@@ -123,25 +123,24 @@ Calculate LMv2 response
 .br
 \fIlen\fP length of key 
 .br
-\fIusername\fP name of the user, as sent in the message, assumed to be in UTF8. 
+\fIusername\fP name of the user, as sent in the message, assumed to be in UTF8\&. 
 .br
-\fItarget\fP the name of the target, assumed to be in UTF8. 
+\fItarget\fP the name of the target, assumed to be in UTF8\&. 
 .br
-\fIserverchallenge\fP challenge as sent by the server in the type2 message. 
+\fIserverchallenge\fP challenge as sent by the server in the type2 message\&. 
 .br
 \fIntlmv2\fP calculated session key 
 .br
-\fIanswer\fP ntlm response answer, should be freed with \fBheim_ntlm_free_buf()\fP.
+\fIanswer\fP ntlm response answer, should be freed with \fBheim_ntlm_free_buf()\fP\&.
 .RE
 .PP
 \fBReturns:\fP
 .RS 4
-In case of success 0 is return, an errors, a errno in what went wrong. 
+In case of success 0 is return, an errors, a errno in what went wrong\&. 
 .RE
 .PP
 
 .SS "int heim_ntlm_calculate_ntlm1 (void * key, size_t len, unsigned char challenge[8], struct \fBntlm_buf\fP * answer)"
-.PP
 Calculate NTLMv1 response hash
 .PP
 \fBParameters:\fP
@@ -152,17 +151,20 @@ Calculate NTLMv1 response hash
 .br
 \fIchallenge\fP sent by the server 
 .br
-\fIanswer\fP calculated answer, should be freed with \fBheim_ntlm_free_buf()\fP.
+\fIanswer\fP calculated answer, should be freed with \fBheim_ntlm_free_buf()\fP\&.
 .RE
 .PP
 \fBReturns:\fP
 .RS 4
-In case of success 0 is return, an errors, a errno in what went wrong. 
+In case of success 0 is return, an errors, a errno in what went wrong\&. 
 .RE
 .PP
 
-.SS "int heim_ntlm_calculate_ntlm2 (const void * key, size_t len, const char * username, const char * target, const unsigned char serverchallenge[8], const struct \fBntlm_buf\fP * infotarget, unsigned char ntlmv2[16], struct \fBntlm_buf\fP * answer)"
 .PP
+\fBExamples: \fP
+.in +1c
+\fBtest_ntlm\&.c\fP\&.
+.SS "int heim_ntlm_calculate_ntlm2 (const void * key, size_t len, const char * username, const char * target, const unsigned char serverchallenge[8], const struct \fBntlm_buf\fP * infotarget, unsigned char ntlmv2[16], struct \fBntlm_buf\fP * answer)"
 Calculate NTLMv2 response
 .PP
 \fBParameters:\fP
@@ -171,116 +173,136 @@ Calculate NTLMv2 response
 .br
 \fIlen\fP length of key 
 .br
-\fIusername\fP name of the user, as sent in the message, assumed to be in UTF8. 
+\fIusername\fP name of the user, as sent in the message, assumed to be in UTF8\&. 
 .br
-\fItarget\fP the name of the target, assumed to be in UTF8. 
+\fItarget\fP the name of the target, assumed to be in UTF8\&. 
 .br
-\fIserverchallenge\fP challenge as sent by the server in the type2 message. 
+\fIserverchallenge\fP challenge as sent by the server in the type2 message\&. 
 .br
-\fIinfotarget\fP infotarget as sent by the server in the type2 message. 
+\fIinfotarget\fP infotarget as sent by the server in the type2 message\&. 
 .br
 \fIntlmv2\fP calculated session key 
 .br
-\fIanswer\fP ntlm response answer, should be freed with \fBheim_ntlm_free_buf()\fP.
+\fIanswer\fP ntlm response answer, should be freed with \fBheim_ntlm_free_buf()\fP\&.
 .RE
 .PP
 \fBReturns:\fP
 .RS 4
-In case of success 0 is return, an errors, a errno in what went wrong. 
+In case of success 0 is return, an errors, a errno in what went wrong\&. 
 .RE
 .PP
 
-.SS "int heim_ntlm_decode_targetinfo (const struct \fBntlm_buf\fP * data, int ucs2, struct ntlm_targetinfo * ti)"
 .PP
+\fBExamples: \fP
+.in +1c
+\fBtest_ntlm\&.c\fP\&.
+.SS "int heim_ntlm_decode_targetinfo (const struct \fBntlm_buf\fP * data, int ucs2, struct ntlm_targetinfo * ti)"
 Decodes an NTLM targetinfo message
 .PP
 \fBParameters:\fP
 .RS 4
 \fIdata\fP input data buffer with the encode NTLM targetinfo message 
 .br
-\fIucs2\fP if the strings should be encoded with ucs2 (selected by flag in message). 
+\fIucs2\fP if the strings should be encoded with ucs2 (selected by flag in message)\&. 
 .br
-\fIti\fP the decoded target info, should be freed with \fBheim_ntlm_free_targetinfo()\fP.
+\fIti\fP the decoded target info, should be freed with \fBheim_ntlm_free_targetinfo()\fP\&.
 .RE
 .PP
 \fBReturns:\fP
 .RS 4
-In case of success 0 is return, an errors, a errno in what went wrong. 
+In case of success 0 is return, an errors, a errno in what went wrong\&. 
 .RE
 .PP
 
-.SS "int heim_ntlm_encode_targetinfo (const struct ntlm_targetinfo * ti, int ucs2, struct \fBntlm_buf\fP * data)"
 .PP
-Encodes a ntlm_targetinfo message.
+\fBExamples: \fP
+.in +1c
+\fBtest_ntlm\&.c\fP\&.
+.SS "int heim_ntlm_encode_targetinfo (const struct ntlm_targetinfo * ti, int ucs2, struct \fBntlm_buf\fP * data)"
+Encodes a ntlm_targetinfo message\&.
 .PP
 \fBParameters:\fP
 .RS 4
-\fIti\fP the ntlm_targetinfo message to encode. 
+\fIti\fP the ntlm_targetinfo message to encode\&. 
 .br
 \fIucs2\fP ignored 
 .br
-\fIdata\fP is the return buffer with the encoded message, should be freed with \fBheim_ntlm_free_buf()\fP.
+\fIdata\fP is the return buffer with the encoded message, should be freed with \fBheim_ntlm_free_buf()\fP\&.
 .RE
 .PP
 \fBReturns:\fP
 .RS 4
-In case of success 0 is return, an errors, a errno in what went wrong. 
+In case of success 0 is return, an errors, a errno in what went wrong\&. 
 .RE
 .PP
 
-.SS "int heim_ntlm_encode_type1 (const struct \fBntlm_type1\fP * type1, struct \fBntlm_buf\fP * data)"
 .PP
-Encodes an \fBntlm_type1\fP message.
+\fBExamples: \fP
+.in +1c
+\fBtest_ntlm\&.c\fP\&.
+.SS "int heim_ntlm_encode_type1 (const struct \fBntlm_type1\fP * type1, struct \fBntlm_buf\fP * data)"
+Encodes an \fBntlm_type1\fP message\&.
 .PP
 \fBParameters:\fP
 .RS 4
-\fItype1\fP the \fBntlm_type1\fP message to encode. 
+\fItype1\fP the \fBntlm_type1\fP message to encode\&. 
 .br
-\fIdata\fP is the return buffer with the encoded message, should be freed with \fBheim_ntlm_free_buf()\fP.
+\fIdata\fP is the return buffer with the encoded message, should be freed with \fBheim_ntlm_free_buf()\fP\&.
 .RE
 .PP
 \fBReturns:\fP
 .RS 4
-In case of success 0 is return, an errors, a errno in what went wrong. 
+In case of success 0 is return, an errors, a errno in what went wrong\&. 
 .RE
 .PP
 
-.SS "int heim_ntlm_encode_type2 (const struct \fBntlm_type2\fP * type2, struct \fBntlm_buf\fP * data)"
 .PP
-Encodes an \fBntlm_type2\fP message.
+\fBExamples: \fP
+.in +1c
+\fBtest_ntlm\&.c\fP\&.
+.SS "int heim_ntlm_encode_type2 (const struct \fBntlm_type2\fP * type2, struct \fBntlm_buf\fP * data)"
+Encodes an \fBntlm_type2\fP message\&.
 .PP
 \fBParameters:\fP
 .RS 4
-\fItype2\fP the \fBntlm_type2\fP message to encode. 
+\fItype2\fP the \fBntlm_type2\fP message to encode\&. 
 .br
-\fIdata\fP is the return buffer with the encoded message, should be freed with \fBheim_ntlm_free_buf()\fP.
+\fIdata\fP is the return buffer with the encoded message, should be freed with \fBheim_ntlm_free_buf()\fP\&.
 .RE
 .PP
 \fBReturns:\fP
 .RS 4
-In case of success 0 is return, an errors, a errno in what went wrong. 
+In case of success 0 is return, an errors, a errno in what went wrong\&. 
 .RE
 .PP
 
-.SS "int heim_ntlm_encode_type3 (const struct \fBntlm_type3\fP * type3, struct \fBntlm_buf\fP * data)"
 .PP
-Encodes an \fBntlm_type3\fP message.
+\fBExamples: \fP
+.in +1c
+\fBtest_ntlm\&.c\fP\&.
+.SS "int heim_ntlm_encode_type3 (const struct \fBntlm_type3\fP * type3, struct \fBntlm_buf\fP * data, size_t * mic_offset)"
+Encodes an \fBntlm_type3\fP message\&.
 .PP
 \fBParameters:\fP
 .RS 4
-\fItype3\fP the \fBntlm_type3\fP message to encode. 
+\fItype3\fP the \fBntlm_type3\fP message to encode\&. 
+.br
+\fIdata\fP is the return buffer with the encoded message, should be 
 .br
-\fIdata\fP is the return buffer with the encoded message, should be freed with \fBheim_ntlm_free_buf()\fP.
+\fImic_offset\fP offset of message integrity code freed with \fBheim_ntlm_free_buf()\fP\&.
 .RE
 .PP
 \fBReturns:\fP
 .RS 4
-In case of success 0 is return, an errors, a errno in what went wrong. 
+In case of success 0 is return, an errors, a errno in what went wrong\&. 
 .RE
 .PP
 
-.SS "void heim_ntlm_free_buf (struct \fBntlm_buf\fP * p)"
 .PP
+\fBExamples: \fP
+.in +1c
+\fBtest_ntlm\&.c\fP\&.
+.SS "void heim_ntlm_free_buf (struct \fBntlm_buf\fP * p)"
 heim_ntlm_free_buf frees the ntlm buffer
 .PP
 \fBParameters:\fP
@@ -289,8 +311,11 @@ heim_ntlm_free_buf frees the ntlm buffer
 .RE
 .PP
 
-.SS "void heim_ntlm_free_targetinfo (struct ntlm_targetinfo * ti)"
 .PP
+\fBExamples: \fP
+.in +1c
+\fBtest_ntlm\&.c\fP\&.
+.SS "void heim_ntlm_free_targetinfo (struct ntlm_targetinfo * ti)"
 Frees the ntlm_targetinfo message
 .PP
 \fBParameters:\fP
@@ -299,8 +324,11 @@ Frees the ntlm_targetinfo message
 .RE
 .PP
 
-.SS "void heim_ntlm_free_type1 (struct \fBntlm_type1\fP * data)"
 .PP
+\fBExamples: \fP
+.in +1c
+\fBtest_ntlm\&.c\fP\&.
+.SS "void heim_ntlm_free_type1 (struct \fBntlm_type1\fP * data)"
 Frees the \fBntlm_type1\fP message
 .PP
 \fBParameters:\fP
@@ -309,8 +337,11 @@ Frees the \fBntlm_type1\fP message
 .RE
 .PP
 
-.SS "void heim_ntlm_free_type2 (struct \fBntlm_type2\fP * data)"
 .PP
+\fBExamples: \fP
+.in +1c
+\fBtest_ntlm\&.c\fP\&.
+.SS "void heim_ntlm_free_type2 (struct \fBntlm_type2\fP * data)"
 Frees the \fBntlm_type2\fP message
 .PP
 \fBParameters:\fP
@@ -319,8 +350,11 @@ Frees the \fBntlm_type2\fP message
 .RE
 .PP
 
-.SS "void heim_ntlm_free_type3 (struct \fBntlm_type3\fP * data)"
 .PP
+\fBExamples: \fP
+.in +1c
+\fBtest_ntlm\&.c\fP\&.
+.SS "void heim_ntlm_free_type3 (struct \fBntlm_type3\fP * data)"
 Frees the \fBntlm_type3\fP message
 .PP
 \fBParameters:\fP
@@ -329,45 +363,50 @@ Frees the \fBntlm_type3\fP message
 .RE
 .PP
 
-.SS "int heim_ntlm_keyex_unwrap (struct \fBntlm_buf\fP * baseKey, struct \fBntlm_buf\fP * encryptedSession, struct \fBntlm_buf\fP * session)"
 .PP
+\fBExamples: \fP
+.in +1c
+\fBtest_ntlm\&.c\fP\&.
+.SS "int heim_ntlm_keyex_unwrap (struct \fBntlm_buf\fP * baseKey, struct \fBntlm_buf\fP * encryptedSession, struct \fBntlm_buf\fP * session)"
 Given a key and encrypted session, unwrap the session key
 .PP
 \fBParameters:\fP
 .RS 4
 \fIbaseKey\fP the sessionBaseKey 
 .br
-\fIencryptedSession\fP encrypted session, type3.session field. 
+\fIencryptedSession\fP encrypted session, type3\&.session field\&. 
 .br
-\fIsession\fP generated session nonce, should be freed with \fBheim_ntlm_free_buf()\fP.
+\fIsession\fP generated session nonce, should be freed with \fBheim_ntlm_free_buf()\fP\&.
 .RE
 .PP
 \fBReturns:\fP
 .RS 4
-In case of success 0 is return, an errors, a errno in what went wrong. 
+In case of success 0 is return, an errors, a errno in what went wrong\&. 
 .RE
 .PP
 
 .SS "int heim_ntlm_nt_key (const char * password, struct \fBntlm_buf\fP * key)"
-.PP
-Calculate the NTLM key, the password is assumed to be in UTF8.
+Calculate the NTLM key, the password is assumed to be in UTF8\&.
 .PP
 \fBParameters:\fP
 .RS 4
-\fIpassword\fP password to calcute the key for. 
+\fIpassword\fP password to calcute the key for\&. 
 .br
-\fIkey\fP calcuted key, should be freed with \fBheim_ntlm_free_buf()\fP.
+\fIkey\fP calcuted key, should be freed with \fBheim_ntlm_free_buf()\fP\&.
 .RE
 .PP
 \fBReturns:\fP
 .RS 4
-In case of success 0 is return, an errors, a errno in what went wrong. 
+In case of success 0 is return, an errors, a errno in what went wrong\&. 
 .RE
 .PP
 
-.SS "int heim_ntlm_ntlmv2_key (const void * key, size_t len, const char * username, const char * target, unsigned char ntlmv2[16])"
 .PP
-Generates an NTLMv2 session key.
+\fBExamples: \fP
+.in +1c
+\fBtest_ntlm\&.c\fP\&.
+.SS "int heim_ntlm_ntlmv2_key (const void * key, size_t len, const char * username, const char * target, int upper_case_target, unsigned char ntlmv2[16])"
+Generates an NTLMv2 session key\&.
 .PP
 \fBParameters:\fP
 .RS 4
@@ -375,22 +414,23 @@ Generates an NTLMv2 session key.
 .br
 \fIlen\fP length of key 
 .br
-\fIusername\fP name of the user, as sent in the message, assumed to be in UTF8. 
+\fIusername\fP name of the user, as sent in the message, assumed to be in UTF8\&. 
+.br
+\fItarget\fP the name of the target, assumed to be in UTF8\&. 
 .br
-\fItarget\fP the name of the target, assumed to be in UTF8. 
+\fIupper_case_target\fP upper case the target, should not be used only for legacy systems 
 .br
 \fIntlmv2\fP the ntlmv2 session key
 .RE
 .PP
 \fBReturns:\fP
 .RS 4
-0 on success, or an error code on failure. 
+0 on success, or an error code on failure\&. 
 .RE
 .PP
 
 .SS "int heim_ntlm_verify_ntlm2 (const void * key, size_t len, const char * username, const char * target, time_t now, const unsigned char serverchallenge[8], const struct \fBntlm_buf\fP * answer, struct \fBntlm_buf\fP * infotarget, unsigned char ntlmv2[16])"
-.PP
-Verify NTLMv2 response.
+Verify NTLMv2 response\&.
 .PP
 \fBParameters:\fP
 .RS 4
@@ -398,24 +438,35 @@ Verify NTLMv2 response.
 .br
 \fIlen\fP length of key 
 .br
-\fIusername\fP name of the user, as sent in the message, assumed to be in UTF8. 
+\fIusername\fP name of the user, as sent in the message, assumed to be in UTF8\&. 
 .br
-\fItarget\fP the name of the target, assumed to be in UTF8. 
+\fItarget\fP the name of the target, assumed to be in UTF8\&. 
 .br
 \fInow\fP the time now (0 if the library should pick it up itself) 
 .br
-\fIserverchallenge\fP challenge as sent by the server in the type2 message. 
+\fIserverchallenge\fP challenge as sent by the server in the type2 message\&. 
 .br
-\fIanswer\fP ntlm response answer, should be freed with \fBheim_ntlm_free_buf()\fP. 
+\fIanswer\fP ntlm response answer, should be freed with \fBheim_ntlm_free_buf()\fP\&. 
 .br
-\fIinfotarget\fP infotarget as sent by the server in the type2 message. 
+\fIinfotarget\fP infotarget as sent by the server in the type2 message\&. 
 .br
 \fIntlmv2\fP calculated session key
 .RE
 .PP
 \fBReturns:\fP
 .RS 4
-In case of success 0 is return, an errors, a errno in what went wrong. 
+In case of success 0 is return, an errors, a errno in what went wrong\&. 
 .RE
 .PP
-
+First check with the domain as the client passed it to the function\&.
+.PP
+Second check with domain uppercased\&.
+.PP
+Third check with empty domain\&.
+.PP
+\fBExamples: \fP
+.in +1c
+\fBtest_ntlm\&.c\fP\&.
+.SH "Author"
+.PP 
+Generated automatically by Doxygen for Heimdalntlmlibrary from the source code\&.
diff --git a/doc/doxyout/ntlm/man/man3/ntlm_type1.3 b/doc/doxyout/ntlm/man/man3/ntlm_type1.3
index 8d2be92da63d..e45171ce6fdd 100644
--- a/doc/doxyout/ntlm/man/man3/ntlm_type1.3
+++ b/doc/doxyout/ntlm/man/man3/ntlm_type1.3
@@ -1,68 +1,21 @@
-.TH "ntlm_type1" 3 "11 Jan 2012" "Version 1.5.2" "Heimdalntlmlibrary" \" -*- nroff -*-
+.TH "ntlm_type1" 3 "Fri Dec 8 2017" "Version 7.5.0" "Heimdalntlmlibrary" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
-ntlm_type1 \- 
+ntlm_type1
 .SH SYNOPSIS
 .br
 .PP
-\fC#include <heimntlm.h>\fP
 .PP
-.SS "Data Fields"
-
-.in +1c
-.ti -1c
-.RI "uint32_t \fBflags\fP"
-.br
-.ti -1c
-.RI "char * \fBdomain\fP"
-.br
-.ti -1c
-.RI "char * \fBhostname\fP"
-.br
-.ti -1c
-.RI "uint32_t \fBos\fP [2]"
-.br
-.in -1c
+\fC#include <heimntlm\&.h>\fP
 .SH "Detailed Description"
 .PP 
-Struct for the NTLM type1 message info, the strings is assumed to be in UTF8. When filled in by the library it should be freed with \fBheim_ntlm_free_type1()\fP. 
-.PP
-\fBExamples: \fP
-.in +1c
-.PP
-\fBtest_ntlm.c\fP.
-.SH "Field Documentation"
-.PP 
-.SS "uint32_t \fBntlm_type1::flags\fP"
-.PP
-
-.PP
-\fBExamples: \fP
-.in +1c
-\fBtest_ntlm.c\fP.
-.SS "char* \fBntlm_type1::domain\fP"
-.PP
-
-.PP
-\fBExamples: \fP
-.in +1c
-\fBtest_ntlm.c\fP.
-.SS "char* \fBntlm_type1::hostname\fP"
-.PP
-
-.PP
-\fBExamples: \fP
-.in +1c
-\fBtest_ntlm.c\fP.
-.SS "uint32_t \fBntlm_type1::os\fP[2]"
-.PP
-
+Struct for the NTLM type1 message info, the strings is assumed to be in UTF8\&. When filled in by the library it should be freed with \fBheim_ntlm_free_type1()\fP\&. 
 .PP
 \fBExamples: \fP
 .in +1c
-\fBtest_ntlm.c\fP.
+\fBtest_ntlm\&.c\fP\&.
 
 .SH "Author"
 .PP 
-Generated automatically by Doxygen for Heimdalntlmlibrary from the source code.
+Generated automatically by Doxygen for Heimdalntlmlibrary from the source code\&.
diff --git a/doc/doxyout/ntlm/man/man3/ntlm_type2.3 b/doc/doxyout/ntlm/man/man3/ntlm_type2.3
index 76a42075b260..0408096ea222 100644
--- a/doc/doxyout/ntlm/man/man3/ntlm_type2.3
+++ b/doc/doxyout/ntlm/man/man3/ntlm_type2.3
@@ -1,80 +1,21 @@
-.TH "ntlm_type2" 3 "11 Jan 2012" "Version 1.5.2" "Heimdalntlmlibrary" \" -*- nroff -*-
+.TH "ntlm_type2" 3 "Fri Dec 8 2017" "Version 7.5.0" "Heimdalntlmlibrary" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
-ntlm_type2 \- 
+ntlm_type2
 .SH SYNOPSIS
 .br
 .PP
-\fC#include <heimntlm.h>\fP
 .PP
-.SS "Data Fields"
-
-.in +1c
-.ti -1c
-.RI "uint32_t \fBflags\fP"
-.br
-.ti -1c
-.RI "char * \fBtargetname\fP"
-.br
-.ti -1c
-.RI "struct \fBntlm_buf\fP \fBtargetinfo\fP"
-.br
-.ti -1c
-.RI "unsigned char \fBchallenge\fP [8]"
-.br
-.ti -1c
-.RI "uint32_t \fBcontext\fP [2]"
-.br
-.ti -1c
-.RI "uint32_t \fBos\fP [2]"
-.br
-.in -1c
+\fC#include <heimntlm\&.h>\fP
 .SH "Detailed Description"
 .PP 
-Struct for the NTLM type2 message info, the strings is assumed to be in UTF8. When filled in by the library it should be freed with \fBheim_ntlm_free_type2()\fP. 
-.PP
-\fBExamples: \fP
-.in +1c
-.PP
-\fBtest_ntlm.c\fP.
-.SH "Field Documentation"
-.PP 
-.SS "uint32_t \fBntlm_type2::flags\fP"
-.PP
-
-.PP
-\fBExamples: \fP
-.in +1c
-\fBtest_ntlm.c\fP.
-.SS "char* \fBntlm_type2::targetname\fP"
-.PP
-
+Struct for the NTLM type2 message info, the strings is assumed to be in UTF8\&. When filled in by the library it should be freed with \fBheim_ntlm_free_type2()\fP\&. 
 .PP
 \fBExamples: \fP
 .in +1c
-\fBtest_ntlm.c\fP.
-.SS "struct \fBntlm_buf\fP \fBntlm_type2::targetinfo\fP\fC [read]\fP"
-.PP
-
-.PP
-\fBExamples: \fP
-.in +1c
-\fBtest_ntlm.c\fP.
-.SS "unsigned char \fBntlm_type2::challenge\fP[8]"
-.PP
-
-.PP
-\fBExamples: \fP
-.in +1c
-\fBtest_ntlm.c\fP.
-.SS "uint32_t \fBntlm_type2::context\fP[2]"
-.PP
-
-.SS "uint32_t \fBntlm_type2::os\fP[2]"
-.PP
-
+\fBtest_ntlm\&.c\fP\&.
 
 .SH "Author"
 .PP 
-Generated automatically by Doxygen for Heimdalntlmlibrary from the source code.
+Generated automatically by Doxygen for Heimdalntlmlibrary from the source code\&.
diff --git a/doc/doxyout/ntlm/man/man3/ntlm_type3.3 b/doc/doxyout/ntlm/man/man3/ntlm_type3.3
index 02d6a49672b4..af4d572640ec 100644
--- a/doc/doxyout/ntlm/man/man3/ntlm_type3.3
+++ b/doc/doxyout/ntlm/man/man3/ntlm_type3.3
@@ -1,96 +1,21 @@
-.TH "ntlm_type3" 3 "11 Jan 2012" "Version 1.5.2" "Heimdalntlmlibrary" \" -*- nroff -*-
+.TH "ntlm_type3" 3 "Fri Dec 8 2017" "Version 7.5.0" "Heimdalntlmlibrary" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
-ntlm_type3 \- 
+ntlm_type3
 .SH SYNOPSIS
 .br
 .PP
-\fC#include <heimntlm.h>\fP
 .PP
-.SS "Data Fields"
-
-.in +1c
-.ti -1c
-.RI "uint32_t \fBflags\fP"
-.br
-.ti -1c
-.RI "char * \fBusername\fP"
-.br
-.ti -1c
-.RI "char * \fBtargetname\fP"
-.br
-.ti -1c
-.RI "struct \fBntlm_buf\fP \fBlm\fP"
-.br
-.ti -1c
-.RI "struct \fBntlm_buf\fP \fBntlm\fP"
-.br
-.ti -1c
-.RI "struct \fBntlm_buf\fP \fBsessionkey\fP"
-.br
-.ti -1c
-.RI "char * \fBws\fP"
-.br
-.ti -1c
-.RI "uint32_t \fBos\fP [2]"
-.br
-.in -1c
+\fC#include <heimntlm\&.h>\fP
 .SH "Detailed Description"
 .PP 
-Struct for the NTLM type3 message info, the strings is assumed to be in UTF8. When filled in by the library it should be freed with \fBheim_ntlm_free_type3()\fP. 
-.PP
-\fBExamples: \fP
-.in +1c
-.PP
-\fBtest_ntlm.c\fP.
-.SH "Field Documentation"
-.PP 
-.SS "uint32_t \fBntlm_type3::flags\fP"
-.PP
-
-.PP
-\fBExamples: \fP
-.in +1c
-\fBtest_ntlm.c\fP.
-.SS "char* \fBntlm_type3::username\fP"
-.PP
-
+Struct for the NTLM type3 message info, the strings is assumed to be in UTF8\&. When filled in by the library it should be freed with \fBheim_ntlm_free_type3()\fP\&. 
 .PP
 \fBExamples: \fP
 .in +1c
-\fBtest_ntlm.c\fP.
-.SS "char* \fBntlm_type3::targetname\fP"
-.PP
-
-.PP
-\fBExamples: \fP
-.in +1c
-\fBtest_ntlm.c\fP.
-.SS "struct \fBntlm_buf\fP \fBntlm_type3::lm\fP\fC [read]\fP"
-.PP
-
-.SS "struct \fBntlm_buf\fP \fBntlm_type3::ntlm\fP\fC [read]\fP"
-.PP
-
-.PP
-\fBExamples: \fP
-.in +1c
-\fBtest_ntlm.c\fP.
-.SS "struct \fBntlm_buf\fP \fBntlm_type3::sessionkey\fP\fC [read]\fP"
-.PP
-
-.SS "char* \fBntlm_type3::ws\fP"
-.PP
-
-.PP
-\fBExamples: \fP
-.in +1c
-\fBtest_ntlm.c\fP.
-.SS "uint32_t \fBntlm_type3::os\fP[2]"
-.PP
-
+\fBtest_ntlm\&.c\fP\&.
 
 .SH "Author"
 .PP 
-Generated automatically by Doxygen for Heimdalntlmlibrary from the source code.
+Generated automatically by Doxygen for Heimdalntlmlibrary from the source code\&.
diff --git a/doc/doxyout/ntlm/man/man3/os.3 b/doc/doxyout/ntlm/man/man3/os.3
deleted file mode 100644
index d1020b43b40d..000000000000
--- a/doc/doxyout/ntlm/man/man3/os.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/ntlm_type1.3
diff --git a/doc/doxyout/ntlm/man/man3/sessionkey.3 b/doc/doxyout/ntlm/man/man3/sessionkey.3
deleted file mode 100644
index de392aede5fd..000000000000
--- a/doc/doxyout/ntlm/man/man3/sessionkey.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/ntlm_type3.3
diff --git a/doc/doxyout/ntlm/man/man3/targetinfo.3 b/doc/doxyout/ntlm/man/man3/targetinfo.3
deleted file mode 100644
index a7659b3d1feb..000000000000
--- a/doc/doxyout/ntlm/man/man3/targetinfo.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/ntlm_type2.3
diff --git a/doc/doxyout/ntlm/man/man3/targetname.3 b/doc/doxyout/ntlm/man/man3/targetname.3
deleted file mode 100644
index a7659b3d1feb..000000000000
--- a/doc/doxyout/ntlm/man/man3/targetname.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/ntlm_type2.3
diff --git a/doc/doxyout/ntlm/man/man3/username.3 b/doc/doxyout/ntlm/man/man3/username.3
deleted file mode 100644
index de392aede5fd..000000000000
--- a/doc/doxyout/ntlm/man/man3/username.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/ntlm_type3.3
diff --git a/doc/doxyout/ntlm/man/man3/ws.3 b/doc/doxyout/ntlm/man/man3/ws.3
deleted file mode 100644
index de392aede5fd..000000000000
--- a/doc/doxyout/ntlm/man/man3/ws.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/ntlm_type3.3