Author: lha Date: 2006-10-07 08:24:40 +0000 (Sat, 07 Oct 2006) New Revision: 568
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=568 Log: merge build fixes from heimdal cvs 20061007 Modified: trunk/heimdal/appl/gssmask/common.h trunk/heimdal/kdc/digest.c trunk/heimdal/kuser/kdigest.c Changeset: Modified: trunk/heimdal/appl/gssmask/common.h =================================================================== --- trunk/heimdal/appl/gssmask/common.h 2006-10-07 08:21:24 UTC (rev 567) +++ trunk/heimdal/appl/gssmask/common.h 2006-10-07 08:24:40 UTC (rev 568) @@ -31,7 +31,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $Id: common.h,v 1.5 2006/10/05 18:13:13 lha Exp $ */ +/* $Id: common.h,v 1.6 2006/10/06 07:22:00 lha Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> @@ -49,6 +49,10 @@ #include <sys/utsname.h> #endif +#ifdef HAVE_SYS_WAIT_H +#include <sys/wait.h> +#endif + #include <assert.h> #include <krb5.h> #include <gssapi.h> Modified: trunk/heimdal/kdc/digest.c =================================================================== --- trunk/heimdal/kdc/digest.c 2006-10-07 08:21:24 UTC (rev 567) +++ trunk/heimdal/kdc/digest.c 2006-10-07 08:24:40 UTC (rev 568) @@ -35,7 +35,7 @@ #include <digest_asn1.h> #include <hex.h> -RCSID("$Id: digest.c,v 1.5 2006/08/28 12:38:44 lha Exp $"); +RCSID("$Id: digest.c,v 1.6 2006/10/06 12:06:45 lha Exp $"); krb5_error_code _kdc_do_digest(krb5_context context, @@ -201,7 +201,7 @@ unsigned char server_nonce[16], identifier; RAND_pseudo_bytes(&identifier, sizeof(identifier)); - RAND_pseudo_bytes(&server_nonce, sizeof(server_nonce)); + RAND_pseudo_bytes(server_nonce, sizeof(server_nonce)); server_nonce[0] = kdc_time & 0xff; server_nonce[1] = (kdc_time >> 8) & 0xff; @@ -488,7 +488,7 @@ if (strcasecmp(ireq.u.digestRequest.type, "CHAP") == 0) { MD5_CTX ctx; - char md[MD5_DIGEST_LENGTH]; + unsigned char md[MD5_DIGEST_LENGTH]; char id; if (ireq.u.digestRequest.identifier == NULL) { @@ -519,7 +519,7 @@ } } else if (strcasecmp(ireq.u.digestRequest.type, "SASL-DIGEST-MD5") == 0) { MD5_CTX ctx; - char md[MD5_DIGEST_LENGTH]; + unsigned char md[MD5_DIGEST_LENGTH]; char *A1, *A2; if (ireq.u.digestRequest.nonceCount == NULL) Modified: trunk/heimdal/kuser/kdigest.c =================================================================== --- trunk/heimdal/kuser/kdigest.c 2006-10-07 08:21:24 UTC (rev 567) +++ trunk/heimdal/kuser/kdigest.c 2006-10-07 08:24:40 UTC (rev 568) @@ -32,7 +32,7 @@ */ #include "kuser_locl.h" -RCSID("$Id: kdigest.c,v 1.4 2006/10/02 10:50:52 lha Exp $"); +RCSID("$Id: kdigest.c,v 1.5 2006/10/06 12:04:47 lha Exp $"); #include <kdigest-commands.h> #include <hex.h> #include "crypto-headers.h" @@ -167,7 +167,8 @@ char *server_nonce, server_identifier; ssize_t size; MD5_CTX ctx; - char md[16], *h; + unsigned char md[16]; + char *h; if (opt->server_nonce_string == NULL) errx(1, "server nonce missing");
