 @@ -20,27 +20,27 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\" $Heimdal: krb5_get_creds.3 22071 2007-11-14 20:04:50Z lha $
-.\" $NetBSD: krb5_get_creds.3,v 1.1 2008/03/22 08:37:14 mlelstv Exp $
+.\" $NetBSD: krb5_get_creds.3,v 1.1.14.1 2010/04/21 05:17:36 matt Exp $
 .\"
 .Dd June 15, 2006
 .Dt KRB5_GET_CREDS 3
 .Os
 .Sh NAME
 .Nm krb5_get_creds ,
 .Nm krb5_get_creds_opt_add_options ,
 .Nm krb5_get_creds_opt_alloc ,
 .Nm krb5_get_creds_opt_free ,
 .Nm krb5_get_creds_opt_set_enctype ,
 .Nm krb5_get_creds_opt_set_impersonate ,
 .Nm krb5_get_creds_opt_set_options ,
 .Nm krb5_get_creds_opt_set_ticket
 @@ -124,27 +124,27 @@ consumers free the memory before calling
 The structure
 .Li krb5_get_creds_opt
 is allocated with
 .Fn krb5_get_creds_opt_alloc
 and freed with
 .Fn krb5_get_creds_opt_free .
 The free function also frees the content of the structure set by the
 accessor functions.
 .Pp
 .Fn krb5_get_creds_opt_add_options
 and
 .Fn krb5_get_creds_opt_set_options
 adds and sets options to the
-.Fi krb5_get_creds_opt
+.Vt krb5_get_creds_opt
 structure .
 The possible options to set are
 .Bl -tag -width "KRB5_GC_USER_USER" -compact
 .It KRB5_GC_CACHED
 Only check the
 .Fa ccache ,
 don't got out on network to fetch credential.
 .It KRB5_GC_USER_USER
 request a user to user ticket.
 This options doesn't store the resulting user to user credential in
 the
 .Fa ccache .
 .It KRB5_GC_EXPIRED_OK

 @@ -20,27 +20,27 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\" $Heimdal: krb5_get_in_cred.3 17593 2006-05-29 14:55:18Z lha $
-.\" $NetBSD: krb5_get_in_cred.3,v 1.1 2008/03/22 08:37:14 mlelstv Exp $
+.\" $NetBSD: krb5_get_in_cred.3,v 1.1.14.1 2010/04/21 05:17:36 matt Exp $
 .\"
 .Dd May 31, 2003
 .Dt KRB5_GET_IN_TKT 3
 .Os
 .Sh NAME
 .Nm krb5_get_in_tkt ,
 .Nm krb5_get_in_cred ,
 .Nm krb5_get_in_tkt_with_password ,
 .Nm krb5_get_in_tkt_with_keytab ,
 .Nm krb5_get_in_tkt_with_skey ,
 .Nm krb5_free_kdc_rep ,
 .Nm krb5_password_key_proc
 .Nd deprecated initial authentication functions
 @@ -160,27 +160,27 @@ stores the credential in a
 .Li krb5_ccache .
 .Pp
 .Nm krb5_get_in_tkt_with_password ,
 .Nm krb5_get_in_tkt_with_keytab ,
 and
 .Nm krb5_get_in_tkt_with_skey
 does the same work as
 .Nm krb5_get_in_cred
 but are more specialized.
 .Pp
 .Nm krb5_get_in_tkt_with_password
 uses the clients password to authenticate.
 If the password argument is
-.DV NULL
+.Dv NULL
 the user user queried with the default password query function.
 .Pp
 .Nm krb5_get_in_tkt_with_keytab
 searches the given keytab for a service entry for the client principal.
 If the keytab is
 .Dv NULL
 the default keytab is used.
 .Pp
 .Nm krb5_get_in_tkt_with_skey
 uses a key to get the initial credential.
 .Pp
 There are some common arguments to the krb5_get_in functions, these are:
 .Pp

 @@ -20,27 +20,27 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\" $Heimdal: krb5_keytab.3 22071 2007-11-14 20:04:50Z lha $
-.\" $NetBSD: krb5_keytab.3,v 1.9 2008/03/22 08:37:14 mlelstv Exp $
+.\" $NetBSD: krb5_keytab.3,v 1.9.14.1 2010/04/21 05:17:36 matt Exp $
 .\"
 .Dd August 12, 2005
 .Dt KRB5_KEYTAB 3
 .Os
 .Sh NAME
 .Nm krb5_kt_ops ,
 .Nm krb5_keytab_entry ,
 .Nm krb5_kt_cursor ,
 .Nm krb5_kt_add_entry ,
 .Nm krb5_kt_close ,
 .Nm krb5_kt_compare ,
 .Nm krb5_kt_copy_entry_contents ,
 .Nm krb5_kt_default ,
 @@ -194,27 +194,27 @@ The default value can be changed in the
 by setting the variable
 .Li [defaults]default_keytab_name .
 .Pp
 The keytab types that are implemented in Heimdal
 are:
 .Bl -tag -width Ds
 .It Nm file
 store the keytab in a file, the type's name is
 .Li FILE .
 The residual part is a filename.
 For compatibility with other Kerberos implemtation
 .Li WRFILE
 and
-.LI JAVA14
+.Li JAVA14
 is also accepted.
 .Li WRFILE
 has the same format as
 .Li FILE .
 .Li JAVA14
 have a format that is compatible with older versions of MIT kerberos
 and SUN's Java based installation.  They store a truncted kvno, so
 when the knvo excess 255, they are truncted in this format.
 .It Nm keyfile
 store the keytab in a
 .Li AFS
 keyfile (usually
 .Pa /usr/afs/etc/KeyFile ) ,
 @@ -370,27 +370,27 @@ releases all resources associated with
 .Fn krb5_kt_get_entry
 retrieves the keytab entry for
 .Fa principal ,
 .Fa kvno ,
 .Fa enctype
 into
 .Fa entry
 from the keytab
 .Fa id .
 When comparing an entry in the keytab to determine a match, the
 function
 .Fn krb5_kt_compare
 is used, so the wildcard rules applies to the argument of
-.F krb5_kt_get_entry
+.Fn krb5_kt_get_entry
 too.
 On success the returne entry must be freed with
 .Fn krb5_kt_free_entry .
 Returns 0 or an error.
 .Pp
 .Fn krb5_kt_read_service_key
 reads the key identified by
 .Fa ( principal ,
 .Fa vno ,
 .Fa enctype )
 from the keytab in
 .Fa keyprocarg
 (the system default keytab if

 @@ -1,14 +1,14 @@
-/*	$NetBSD: handler.c,v 1.21.4.1 2009/02/08 18:42:16 snj Exp $	*/
+/*	$NetBSD: handler.c,v 1.21.4.1.4.1 2010/04/21 05:17:36 matt Exp $	*/
 /* Id: handler.c,v 1.28 2006/05/26 12:17:29 manubsd Exp */
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -468,27 +468,27 @@ getph2byseq(seq)
 	return NULL;
+}
 /*
  * search ph2handle with message id.
  */
 struct ph2handle *
 getph2bymsgid(iph1, msgid)
 	struct ph1handle *iph1;
 	u_int32_t msgid;
+{
 	struct ph2handle *p;
-	LIST_FOREACH(p, &ph2tree, chain) {
+	LIST_FOREACH(p, &iph1->ph2tree, ph1bind) {
 		if (p->msgid == msgid)
 			return p;
+	}
 	return NULL;
+}
 struct ph2handle *
 getph2byid(src, dst, spid)
 	struct sockaddr *src, *dst;
 	u_int32_t spid;
+{
 	struct ph2handle *p;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: isakmp.c,v 1.42.4.1 2009/02/08 18:42:16 snj Exp $	*/
+/*	$NetBSD: isakmp.c,v 1.42.4.1.4.1 2010/04/21 05:17:36 matt Exp $	*/
 /* Id: isakmp.c,v 1.74 2006/05/07 21:32:59 manubsd Exp */
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -3076,26 +3076,36 @@ script_hook(iph1, script)
 			plog(LLV_ERROR, LOCATION, NULL,
 			    "Cannot set REMOTE_ADDR\n");
 			goto out;
+		}
 		if (script_env_append(&envp, &envc,
 		    "REMOTE_PORT", portstr) != 0) {
 			plog(LLV_ERROR, LOCATION, NULL,
 			    "Cannot set REMOTEL_PORT\n");
 			goto out;
+		}
+	}
 	/* Peer identity. */
 	if (iph1->id_p != NULL) {
 		if (script_env_append(&envp, &envc, "REMOTE_ID",
 				      ipsecdoi_id2str(iph1->id_p)) != 0) {
 			plog(LLV_ERROR, LOCATION, NULL,
 			     "Cannot set REMOTE_ID\n");
 			goto out;
+		}
+	}
 	if (privsep_script_exec(iph1->rmconf->script[script]->v,
 	    script, envp) != 0)
 		plog(LLV_ERROR, LOCATION, NULL,
 		    "Script %s execution failed\n", script_names[script]);
 out:
 	for (c = envp; *c; c++)
 		racoon_free(*c);
 	racoon_free(envp);
 	return;
+}

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: racoon.conf.5,v 1.46.4.1 2009/02/08 18:42:18 snj Exp $
+.\"	$NetBSD: racoon.conf.5,v 1.46.4.1.4.1 2010/04/21 05:17:36 matt Exp $
 .\"
 .\"	Id: racoon.conf.5,v 1.54 2006/08/22 18:17:17 manubsd Exp
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 @@ -564,26 +564,28 @@ Both scripts get either
 or
 .Ic phase1_down
 as first argument, and the following
 variables are set in their environment:
 .Bl -tag -width Ds -compact
 .It Ev LOCAL_ADDR
 The local address of the phase 1 SA.
 .It Ev LOCAL_PORT
 The local port used for IKE for the phase 1 SA.
 .It Ev REMOTE_ADDR
 The remote address of the phase 1 SA.
 .It Ev REMOTE_PORT
 The remote port used for IKE for the phase 1 SA.
 .It Ev REMOTE_ID
 The remote identity received in IKE for the phase 1 SA.
 .El
 The following variables are only set if
 .Ic mode_cfg
 was enabled:
 .Bl -tag -width Ds -compact
 .It INTERNAL_ADDR4
 An IPv4 internal address obtained by ISAKMP mode config.
 .It INTERNAL_NETMASK4
 An IPv4 internal netmask obtained by ISAKMP mode config.
 .It INTERNAL_CIDR4
 An IPv4 internal netmask obtained by ISAKMP mode config, in CIDR notation.
 .It INTERNAL_DNS4
 The first internal DNS server IPv4 address obtained by ISAKMP mode config.

 @@ -126,35 +126,26 @@ static DSO *zlib_dso = NULL;
 #define deflate                 p_deflate
 #define deflateInit_            p_deflateInit_
 #define zError			p_zError
 #endif /* ZLIB_SHARED */
 struct zlib_state
+	{
 	z_stream istream;
 	z_stream ostream;
 	};
 static int zlib_stateful_ex_idx = -1;
 static void zlib_stateful_free_ex_data(void *obj, void *item,
 	CRYPTO_EX_DATA *ad, int ind,long argl, void *argp)
 	struct zlib_state *state = (struct zlib_state *)item;
 	inflateEnd(&state->istream);
 	deflateEnd(&state->ostream);
 	OPENSSL_free(state);
 static int zlib_stateful_init(COMP_CTX *ctx)
+	{
 	int err;
 	struct zlib_state *state =
 		(struct zlib_state *)OPENSSL_malloc(sizeof(struct zlib_state));
 	if (state == NULL)
 		goto err;
 	state->istream.zalloc = zlib_zalloc;
 	state->istream.zfree = zlib_zfree;
 	state->istream.opaque = Z_NULL;
 	state->istream.next_in = Z_NULL;
 @@ -178,26 +169,32 @@ static int zlib_stateful_init(COMP_CTX *
 	if (err != Z_OK)
 		goto err;
 	CRYPTO_new_ex_data(CRYPTO_EX_INDEX_COMP,ctx,&ctx->ex_data);
 	CRYPTO_set_ex_data(&ctx->ex_data,zlib_stateful_ex_idx,state);
 	return 1;
  err:
 	if (state) OPENSSL_free(state);
 	return 0;
+	}
 static void zlib_stateful_finish(COMP_CTX *ctx)
+	{
 	struct zlib_state *state =
 		(struct zlib_state *)CRYPTO_get_ex_data(&ctx->ex_data,
 			zlib_stateful_ex_idx);
 	inflateEnd(&state->istream);
 	deflateEnd(&state->ostream);
 	OPENSSL_free(state);
 	CRYPTO_free_ex_data(CRYPTO_EX_INDEX_COMP,ctx,&ctx->ex_data);
+	}
 static int zlib_stateful_compress_block(COMP_CTX *ctx, unsigned char *out,
 	unsigned int olen, unsigned char *in, unsigned int ilen)
+	{
 	int err = Z_OK;
 	struct zlib_state *state =
 		(struct zlib_state *)CRYPTO_get_ex_data(&ctx->ex_data,
 			zlib_stateful_ex_idx);
 	if (state == NULL)
 		return -1;
 @@ -392,27 +389,27 @@ COMP_METHOD *COMP_zlib(void)
 	if (zlib_loaded)
 #endif
 #if defined(ZLIB) || defined(ZLIB_SHARED)
+		{
 		/* init zlib_stateful_ex_idx here so that in a multi-process
 		 * application it's enough to intialize openssl before forking
 		 * (idx will be inherited in all the children) */
 		if (zlib_stateful_ex_idx == -1)
+			{
 			CRYPTO_w_lock(CRYPTO_LOCK_COMP);
 			if (zlib_stateful_ex_idx == -1)
 				zlib_stateful_ex_idx =
 					CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_COMP,
-,NULL,NULL,NULL,zlib_stateful_free_ex_data);
+,NULL,NULL,NULL,NULL);
 			CRYPTO_w_unlock(CRYPTO_LOCK_COMP);
 			if (zlib_stateful_ex_idx == -1)
 				goto err;
+			}
 		meth = &zlib_stateful_method;
+		}
 err:
 #endif
 	return(meth);
+	}

 @@ -148,40 +148,44 @@ static const EVP_MD sha256_md=
 	sizeof(EVP_MD *)+sizeof(SHA256_CTX),
 	};
 const EVP_MD *EVP_sha256(void)
 	{ return(&sha256_md); }
 #endif	/* ifndef OPENSSL_NO_SHA256 */
 #ifndef OPENSSL_NO_SHA512
 static int init384(EVP_MD_CTX *ctx)
 	{ return SHA384_Init(ctx->md_data); }
 static int init512(EVP_MD_CTX *ctx)
 	{ return SHA512_Init(ctx->md_data); }
 /* See comment in SHA224/256 section */
 static int update384(EVP_MD_CTX *ctx,const void *data,size_t count)
 	{ return SHA384_Update(ctx->md_data,data,count); }
 static int update512(EVP_MD_CTX *ctx,const void *data,size_t count)
 	{ return SHA512_Update(ctx->md_data,data,count); }
 static int final384(EVP_MD_CTX *ctx,unsigned char *md)
 	{ return SHA384_Final(md,ctx->md_data); }
 static int final512(EVP_MD_CTX *ctx,unsigned char *md)
 	{ return SHA512_Final(md,ctx->md_data); }
 static const EVP_MD sha384_md=
+	{
 	NID_sha384,
 	NID_sha384WithRSAEncryption,
 	SHA384_DIGEST_LENGTH,
 	EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
 	init384,
-	update512,
+	update384,
-	final512,
+	final384,
 	NULL,
 	NULL,
 	EVP_PKEY_RSA_method,
 	SHA512_CBLOCK,
 	sizeof(EVP_MD *)+sizeof(SHA512_CTX),
 	};
 const EVP_MD *EVP_sha384(void)
 	{ return(&sha384_md); }
 static const EVP_MD sha512_md=
+	{
 	NID_sha512,

	@@ -560,27 +560,27 @@ void ssl3_free_digest_list(SSL *s)		@@ -560,27 +560,27 @@ void ssl3_free_digest_list(SSL *s)
560	}	560	}
561	OPENSSL_free(s->s3->handshake_dgst);	561	OPENSSL_free(s->s3->handshake_dgst);
562	s->s3->handshake_dgst=NULL;	562	s->s3->handshake_dgst=NULL;
563	}	563	}
564		564
565		565
566		566
567	void ssl3_finish_mac(SSL s, const unsigned char buf, int len)	567	void ssl3_finish_mac(SSL s, const unsigned char buf, int len)
568	{	568	{
569	if (s->s3->handshake_buffer)	569	if (s->s3->handshake_buffer)
570	{	570	{
571	BIO_write (s->s3->handshake_buffer,(void *)buf,len);	571	BIO_write (s->s3->handshake_buffer,(void *)buf,len);
572	}	572	}
573	else	573	else if (s->s3->handshake_dgst != NULL)
574	{	574	{
575	int i;	575	int i;
576	for (i=0;i< SSL_MAX_DIGEST;i++)	576	for (i=0;i< SSL_MAX_DIGEST;i++)
577	{	577	{
578	if (s->s3->handshake_dgst[i]!= NULL)	578	if (s->s3->handshake_dgst[i]!= NULL)
579	EVP_DigestUpdate(s->s3->handshake_dgst[i],buf,len);	579	EVP_DigestUpdate(s->s3->handshake_dgst[i],buf,len);
580	}	580	}
581	}	581	}
582	}	582	}
583	void ssl3_digest_cached_records(SSL *s)	583	void ssl3_digest_cached_records(SSL *s)
584	{	584	{
585	int i;	585	int i;
586	long mask;	586	long mask;

	@@ -740,34 +740,36 @@ int tls1_enc(SSL *s, int send)		@@ -740,34 +740,36 @@ int tls1_enc(SSL *s, int send)
740	rec->length-=i;	740	rec->length-=i;
741	}	741	}
742	}	742	}
743	return(1);	743	return(1);
744	}	744	}
745	int tls1_cert_verify_mac(SSL s, int md_nid, unsigned char out)	745	int tls1_cert_verify_mac(SSL s, int md_nid, unsigned char out)
746	{	746	{
747	unsigned int ret;	747	unsigned int ret;
748	EVP_MD_CTX ctx, *d=NULL;	748	EVP_MD_CTX ctx, *d=NULL;
749	int i;	749	int i;
750		750
751	if (s->s3->handshake_buffer)	751	if (s->s3->handshake_buffer)
752	ssl3_digest_cached_records(s);	752	ssl3_digest_cached_records(s);
753	for (i=0;i<SSL_MAX_DIGEST;i++)	753	if (s->s3->handshake_dgst) {
754	{	754	for (i=0;i<SSL_MAX_DIGEST;i++)
755	if (s->s3->handshake_dgst[i]&&EVP_MD_CTX_type(s->s3->handshake_dgst[i])==md_nid)	755	{
756	{	756	if (s->s3->handshake_dgst[i]&&EVP_MD_CTX_type(s->s3->handshake_dgst[i])==md_nid)
757	d=s->s3->handshake_dgst[i];	757	{
758	break;	758	d=s->s3->handshake_dgst[i];
		759	break;
		760	}
759	}	761	}
760	}	762	}
761	if (!d) {	763	if (!d) {
762	SSLerr(SSL_F_TLS1_CERT_VERIFY_MAC,SSL_R_NO_REQUIRED_DIGEST);	764	SSLerr(SSL_F_TLS1_CERT_VERIFY_MAC,SSL_R_NO_REQUIRED_DIGEST);
763	return 0;	765	return 0;
764	}	766	}
765		767
766	EVP_MD_CTX_init(&ctx);	768	EVP_MD_CTX_init(&ctx);
767	EVP_MD_CTX_copy_ex(&ctx,d);	769	EVP_MD_CTX_copy_ex(&ctx,d);
768	EVP_DigestFinal_ex(&ctx,out,&ret);	770	EVP_DigestFinal_ex(&ctx,out,&ret);
769	EVP_MD_CTX_cleanup(&ctx);	771	EVP_MD_CTX_cleanup(&ctx);
770	return((int)ret);	772	return((int)ret);
771	}	773	}
772		774
773	int tls1_final_finish_mac(SSL *s,	775	int tls1_final_finish_mac(SSL *s,
	@@ -784,27 +786,28 @@ int tls1_final_finish_mac(SSL *s,		@@ -784,27 +786,28 @@ int tls1_final_finish_mac(SSL *s,
784		786
785	q=buf;	787	q=buf;
786		788
787	EVP_MD_CTX_init(&ctx);	789	EVP_MD_CTX_init(&ctx);
788		790
789	if (s->s3->handshake_buffer)	791	if (s->s3->handshake_buffer)
790	ssl3_digest_cached_records(s);	792	ssl3_digest_cached_records(s);
791		793
792	for (idx=0;ssl_get_handshake_digest(idx,&mask,&md);idx++)	794	for (idx=0;ssl_get_handshake_digest(idx,&mask,&md);idx++)
793	{	795	{
794	if (mask & s->s3->tmp.new_cipher->algorithm2)	796	if (mask & s->s3->tmp.new_cipher->algorithm2)
795	{	797	{
796	unsigned int hashsize = EVP_MD_size(md);	798	unsigned int hashsize = EVP_MD_size(md);
797	if (hashsize > (sizeof buf - (size_t)(q-buf)))	799	if (hashsize > (sizeof buf - (size_t)(q-buf)) \|\|
		800	s->s3->handshake_dgst == NULL)
798	{	801	{
799	/* internal error: 'buf' is too small for this cipersuite! */	802	/* internal error: 'buf' is too small for this cipersuite! */
800	err = 1;	803	err = 1;
801	}	804	}
802	else	805	else
803	{	806	{
804	EVP_MD_CTX_copy_ex(&ctx,s->s3->handshake_dgst[idx]);	807	EVP_MD_CTX_copy_ex(&ctx,s->s3->handshake_dgst[idx]);
805	EVP_DigestFinal_ex(&ctx,q,&i);	808	EVP_DigestFinal_ex(&ctx,q,&i);
806	if (i != hashsize) /* can't really happen */	809	if (i != hashsize) /* can't really happen */
807	err = 1;	810	err = 1;
808	q+=i;	811	q+=i;
809	}	812	}
810	}	813	}

	@@ -3279,26 +3279,29 @@ int ssl3_read(SSL s, void buf, int len		@@ -3279,26 +3279,29 @@ int ssl3_read(SSL s, void buf, int len
3279	int ssl3_peek(SSL s, void buf, int len)	3279	int ssl3_peek(SSL s, void buf, int len)
3280	{	3280	{
3281	return ssl3_read_internal(s, buf, len, 1);	3281	return ssl3_read_internal(s, buf, len, 1);
3282	}	3282	}
3283		3283
3284	int ssl3_renegotiate(SSL *s)	3284	int ssl3_renegotiate(SSL *s)
3285	{	3285	{
3286	if (s->handshake_func == NULL)	3286	if (s->handshake_func == NULL)
3287	return(1);	3287	return(1);
3288		3288
3289	if (s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)	3289	if (s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
3290	return(0);	3290	return(0);
3291		3291
		3292	if (!(s->s3->flags & SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))
		3293	return(0);
		3294
3292	s->s3->renegotiate=1;	3295	s->s3->renegotiate=1;
3293	return(1);	3296	return(1);
3294	}	3297	}
3295		3298
3296	int ssl3_renegotiate_check(SSL *s)	3299	int ssl3_renegotiate_check(SSL *s)
3297	{	3300	{
3298	int ret=0;	3301	int ret=0;
3299		3302
3300	if (s->s3->renegotiate)	3303	if (s->s3->renegotiate)
3301	{	3304	{
3302	if ( (s->s3->rbuf.left == 0) &&	3305	if ( (s->s3->rbuf.left == 0) &&
3303	(s->s3->wbuf.left == 0) &&	3306	(s->s3->wbuf.left == 0) &&
3304	!SSL_in_init(s))	3307	!SSL_in_init(s))

	@@ -303,29 +303,29 @@ again:		@@ -303,29 +303,29 @@ again:
303	ssl_minor= *(p++);	303	ssl_minor= *(p++);
304	version=(ssl_major<<8)\|ssl_minor;	304	version=(ssl_major<<8)\|ssl_minor;
305	n2s(p,rr->length);	305	n2s(p,rr->length);
306	#if 0	306	#if 0
307	fprintf(stderr, "Record type=%d, Length=%d\n", rr->type, rr->length);	307	fprintf(stderr, "Record type=%d, Length=%d\n", rr->type, rr->length);
308	#endif	308	#endif
309		309
310	/* Lets check version */	310	/* Lets check version */
311	if (!s->first_packet)	311	if (!s->first_packet)
312	{	312	{
313	if (version != s->version)	313	if (version != s->version)
314	{	314	{
315	SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_WRONG_VERSION_NUMBER);	315	SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_WRONG_VERSION_NUMBER);
316	/* Send back error using their	316	if ((s->version & 0xFF00) == (version & 0xFF00))
317	* version number :-) */	317	/* Send back error using their minor version number :-) */
318	s->version=version;	318	s->version = (unsigned short)version;
319	al=SSL_AD_PROTOCOL_VERSION;	319	al=SSL_AD_PROTOCOL_VERSION;
320	goto f_err;	320	goto f_err;
321	}	321	}
322	}	322	}
323		323
324	if ((version>>8) != SSL3_VERSION_MAJOR)	324	if ((version>>8) != SSL3_VERSION_MAJOR)
325	{	325	{
326	SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_WRONG_VERSION_NUMBER);	326	SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_WRONG_VERSION_NUMBER);
327	goto err;	327	goto err;
328	}	328	}
329		329
330	if (rr->length > s->s3->rbuf.len - SSL3_RT_HEADER_LENGTH)	330	if (rr->length > s->s3->rbuf.len - SSL3_RT_HEADER_LENGTH)
331	{	331	{
	@@ -1031,26 +1031,27 @@ start:		@@ -1031,26 +1031,27 @@ start:
1031	(s->s3->handshake_fragment[2] != 0) \|\|	1031	(s->s3->handshake_fragment[2] != 0) \|\|
1032	(s->s3->handshake_fragment[3] != 0))	1032	(s->s3->handshake_fragment[3] != 0))
1033	{	1033	{
1034	al=SSL_AD_DECODE_ERROR;	1034	al=SSL_AD_DECODE_ERROR;
1035	SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_BAD_HELLO_REQUEST);	1035	SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_BAD_HELLO_REQUEST);
1036	goto f_err;	1036	goto f_err;
1037	}	1037	}
1038		1038
1039	if (s->msg_callback)	1039	if (s->msg_callback)
1040	s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->s3->handshake_fragment, 4, s, s->msg_callback_arg);	1040	s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->s3->handshake_fragment, 4, s, s->msg_callback_arg);
1041		1041
1042	if (SSL_is_init_finished(s) &&	1042	if (SSL_is_init_finished(s) &&
1043	!(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) &&	1043	!(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) &&
		1044	(s->s3->flags & SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION) &&
1044	!s->s3->renegotiate)	1045	!s->s3->renegotiate)
1045	{	1046	{
1046	ssl3_renegotiate(s);	1047	ssl3_renegotiate(s);
1047	if (ssl3_renegotiate_check(s))	1048	if (ssl3_renegotiate_check(s))
1048	{	1049	{
1049	i=s->handshake_func(s);	1050	i=s->handshake_func(s);
1050	if (i < 0) return(i);	1051	if (i < 0) return(i);
1051	if (i == 0)	1052	if (i == 0)
1052	{	1053	{
1053	SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_SSL_HANDSHAKE_FAILURE);	1054	SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_SSL_HANDSHAKE_FAILURE);
1054	return(-1);	1055	return(-1);
1055	}	1056	}
1056		1057
	@@ -1163,27 +1164,28 @@ start:		@@ -1163,27 +1164,28 @@ start:
1163	s->msg_callback(0, s->version, SSL3_RT_CHANGE_CIPHER_SPEC, rr->data, 1, s, s->msg_callback_arg);	1164	s->msg_callback(0, s->version, SSL3_RT_CHANGE_CIPHER_SPEC, rr->data, 1, s, s->msg_callback_arg);
1164		1165
1165	s->s3->change_cipher_spec=1;	1166	s->s3->change_cipher_spec=1;
1166	if (!ssl3_do_change_cipher_spec(s))	1167	if (!ssl3_do_change_cipher_spec(s))
1167	goto err;	1168	goto err;
1168	else	1169	else
1169	goto start;	1170	goto start;
1170	}	1171	}
1171		1172
1172	/* Unexpected handshake message (Client Hello, or protocol violation) */	1173	/* Unexpected handshake message (Client Hello, or protocol violation) */
1173	if ((s->s3->handshake_fragment_len >= 4) && !s->in_handshake)	1174	if ((s->s3->handshake_fragment_len >= 4) && !s->in_handshake)
1174	{	1175	{
1175	if (((s->state&SSL_ST_MASK) == SSL_ST_OK) &&	1176	if (((s->state&SSL_ST_MASK) == SSL_ST_OK) &&
1176	!(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS))	1177	!(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) &&
		1178	(s->s3->flags & SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))
1177	{	1179	{
1178	#if 0 /* worked only because C operator preferences are not as expected (and	1180	#if 0 /* worked only because C operator preferences are not as expected (and
1179	* because this is not really needed for clients except for detecting	1181	* because this is not really needed for clients except for detecting
1180	* protocol violations): */	1182	* protocol violations): */
1181	s->state=SSL_ST_BEFORE\|(s->server)	1183	s->state=SSL_ST_BEFORE\|(s->server)
1182	?SSL_ST_ACCEPT	1184	?SSL_ST_ACCEPT
1183	:SSL_ST_CONNECT;	1185	:SSL_ST_CONNECT;
1184	#else	1186	#else
1185	s->state = s->server ? SSL_ST_ACCEPT : SSL_ST_CONNECT;	1187	s->state = s->server ? SSL_ST_ACCEPT : SSL_ST_CONNECT;
1186	#endif	1188	#endif
1187	s->new_session=1;	1189	s->new_session=1;
1188	}	1190	}
1189	i=s->handshake_func(s);	1191	i=s->handshake_func(s);

 @@ -522,32 +522,34 @@ int ssl3_accept(SSL *s)
+				{
 				int offset=0;
 				int dgst_num;
 				s->state=SSL3_ST_SR_CERT_VRFY_A;
 				s->init_num=0;
 				/* We need to get hashes here so if there is
 				 * a client cert, it can be verified
 				 * FIXME - digest processing for CertificateVerify
 				 * should be generalized. But it is next step
 				 */
 				if (s->s3->handshake_buffer)
 					ssl3_digest_cached_records(s);
-				for (dgst_num=0; dgst_num<SSL_MAX_DIGEST;dgst_num++)
+				if (s->s3->handshake_dgst != NULL) {
-					if (s->s3->handshake_dgst[dgst_num])
+					for (dgst_num=0; dgst_num<SSL_MAX_DIGEST;dgst_num++)
 						if (s->s3->handshake_dgst[dgst_num])
 						s->method->ssl3_enc->cert_verify_mac(s,EVP_MD_CTX_type(s->s3->handshake_dgst[dgst_num]),&(s->s3->tmp.cert_verify_md[offset]));
-						offset+=EVP_MD_CTX_size(s->s3->handshake_dgst[dgst_num]);
+							s->method->ssl3_enc->cert_verify_mac(s,EVP_MD_CTX_type(s->s3->handshake_dgst[dgst_num]),&(s->s3->tmp.cert_verify_md[offset]));
 							offset+=EVP_MD_CTX_size(s->s3->handshake_dgst[dgst_num]);
+							}
+					}
+				}
 			break;
 		case SSL3_ST_SR_CERT_VRFY_A:
 		case SSL3_ST_SR_CERT_VRFY_B:
 			/* we should decide if we expected this one */
 			ret=ssl3_get_cert_verify(s);
 			if (ret <= 0) goto end;
 			s->state=SSL3_ST_SR_FINISHED_A;
 			s->init_num=0;
 			break;
 @@ -753,26 +755,34 @@ int ssl3_check_client_hello(SSL *s)
 int ssl3_get_client_hello(SSL *s)
+	{
 	int i,j,ok,al,ret= -1;
 	unsigned int cookie_len;
 	long n;
 	unsigned long id;
 	unsigned char *p,*d,*q;
 	SSL_CIPHER *c;
 #ifndef OPENSSL_NO_COMP
 	SSL_COMP *comp=NULL;
 #endif
 	STACK_OF(SSL_CIPHER) *ciphers=NULL;
 	if (s->new_session
 	    && !(s->s3->flags&SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))
+		{
 		al=SSL_AD_HANDSHAKE_FAILURE;
 		SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
 		goto f_err;
+		}
 	/* We do this so that we will respond with our native type.
 	 * If we are TLSv1 and we get SSLv3, we will respond with TLSv1,
 	 * This down switching should be handled by a different method.
 	 * If we are SSLv3, we will respond with SSLv3, even if prompted with
 	 * TLSv1.
 	 */
 	if (s->state == SSL3_ST_SR_CLNT_HELLO_A)
+		{
 		s->state=SSL3_ST_SR_CLNT_HELLO_B;
+		}
 	s->first_packet=1;
 	n=s->method->ssl_get_message(s,
 		SSL3_ST_SR_CLNT_HELLO_B,

 @@ -440,26 +440,28 @@
 #define CERT_PUBLIC_KEY		1
 #define CERT_PRIVATE_KEY	2
 */
 #ifndef OPENSSL_NO_EC
 /* From ECC-TLS draft, used in encoding the curve type in
  * ECParameters
  */
 #define EXPLICIT_PRIME_CURVE_TYPE  1
 #define EXPLICIT_CHAR2_CURVE_TYPE  2
 #define NAMED_CURVE_TYPE           3
 #endif  /* OPENSSL_NO_EC */
 #define SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION	0x0010
 typedef struct cert_pkey_st
+	{
 	X509 *x509;
 	EVP_PKEY *privatekey;
 	} CERT_PKEY;
 typedef struct cert_st
+	{
 	/* Current active set */
 	CERT_PKEY *key; /* ALWAYS points to an element of the pkeys array
 			 * Probably it would make more sense to store
 			 * an index, not a pointer. */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cipher.c,v 1.21.8.1 2009/06/29 23:01:24 snj Exp $	*/
+/*	$NetBSD: cipher.c,v 1.21.8.1.2.1 2010/04/21 05:17:37 matt Exp $	*/
 /* $OpenBSD: cipher.c,v 1.81 2006/08/03 03:34:42 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
+ *
  * As far as I am concerned, the code I have written for this software
  * can be used freely for any purpose.  Any derived versions of this
  * software must be clearly marked as such, and if the derived work is
  * incompatible with the protocol description in the RFC file, it must be
  * called by a name other than "ssh" or "Secure Shell".
+ *
+ *
 @@ -27,27 +27,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-__RCSID("$NetBSD: cipher.c,v 1.21.8.1 2009/06/29 23:01:24 snj Exp $");
+__RCSID("$NetBSD: cipher.c,v 1.21.8.1.2.1 2010/04/21 05:17:37 matt Exp $");
 #include <sys/types.h>
 #include <openssl/md5.h>
 #include <string.h>
 #include <stdarg.h>
 #include "xmalloc.h"
 #include "log.h"
 #include "cipher.h"
 extern const EVP_CIPHER *evp_ssh1_bf(void);
 extern const EVP_CIPHER *evp_ssh1_3des(void);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cipher.h,v 1.2.28.1 2009/06/29 23:01:24 snj Exp $	*/
+/*	$NetBSD: cipher.h,v 1.2.28.1.2.1 2010/04/21 05:17:37 matt Exp $	*/
 /* $OpenBSD: cipher.h,v 1.36 2006/03/25 22:22:42 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
+ *
  * As far as I am concerned, the code I have written for this software
  * can be used freely for any purpose.  Any derived versions of this
  * software must be clearly marked as such, and if the derived work is
  * incompatible with the protocol description in the RFC file, it must be
  * called by a name other than "ssh" or "Secure Shell".
+ *

 @@ -1,14 +1,14 @@
-/*	$NetBSD: packet.c,v 1.30.8.1 2009/06/29 23:01:24 snj Exp $	*/
+/*	$NetBSD: packet.c,v 1.30.8.1.2.1 2010/04/21 05:17:37 matt Exp $	*/
 /* $OpenBSD: packet.c,v 1.151 2008/02/22 20:44:02 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
  * This file contains code implementing the packet protocol and communication
  * with the other side.  This same code is used both on client and server side.
+ *
  * As far as I am concerned, the code I have written for this software
  * can be used freely for any purpose.  Any derived versions of this
  * software must be clearly marked as such, and if the derived work is
  * incompatible with the protocol description in the RFC file, it must be
  * called by a name other than "ssh" or "Secure Shell".
 @@ -29,27 +29,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-__RCSID("$NetBSD: packet.c,v 1.30.8.1 2009/06/29 23:01:24 snj Exp $");
+__RCSID("$NetBSD: packet.c,v 1.30.8.1.2.1 2010/04/21 05:17:37 matt Exp $");
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/param.h>
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <errno.h>
 #include <stdarg.h>