Module Name: src
Committed By: matt
Date: Wed Apr 21 05:17:37 UTC 2010
Modified Files:
src/crypto/dist/heimdal/lib/krb5 [matt-nb5-mips64]: krb5_get_creds.3
krb5_get_in_cred.3 krb5_keytab.3
src/crypto/dist/ipsec-tools/src/racoon [matt-nb5-mips64]: handler.c
isakmp.c racoon.conf.5
src/crypto/dist/openssl/crypto/comp [matt-nb5-mips64]: c_zlib.c
src/crypto/dist/openssl/crypto/evp [matt-nb5-mips64]: m_sha1.c
src/crypto/dist/openssl/ssl [matt-nb5-mips64]: s3_enc.c s3_lib.c
s3_pkt.c s3_srvr.c ssl_locl.h t1_enc.c
src/crypto/dist/ssh [matt-nb5-mips64]: cipher.c cipher.h packet.c
Log Message:
sync to netbsd-5
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.14.1 \
src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3 \
src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3
cvs rdiff -u -r1.9 -r1.9.14.1 src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3
cvs rdiff -u -r1.21.4.1 -r1.21.4.1.4.1 \
src/crypto/dist/ipsec-tools/src/racoon/handler.c
cvs rdiff -u -r1.42.4.1 -r1.42.4.1.4.1 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp.c
cvs rdiff -u -r1.46.4.1 -r1.46.4.1.4.1 \
src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.10.1 \
src/crypto/dist/openssl/crypto/comp/c_zlib.c
cvs rdiff -u -r1.1.1.5.8.1 -r1.1.1.5.8.1.2.1 \
src/crypto/dist/openssl/crypto/evp/m_sha1.c
cvs rdiff -u -r1.1.1.12 -r1.1.1.12.10.1 src/crypto/dist/openssl/ssl/s3_enc.c \
src/crypto/dist/openssl/ssl/t1_enc.c
cvs rdiff -u -r1.14 -r1.14.10.1 src/crypto/dist/openssl/ssl/s3_lib.c
cvs rdiff -u -r1.9.8.1 -r1.9.8.1.2.1 src/crypto/dist/openssl/ssl/s3_pkt.c
cvs rdiff -u -r1.15.4.1 -r1.15.4.1.4.1 src/crypto/dist/openssl/ssl/s3_srvr.c
cvs rdiff -u -r1.13 -r1.13.10.1 src/crypto/dist/openssl/ssl/ssl_locl.h
cvs rdiff -u -r1.21.8.1 -r1.21.8.1.2.1 src/crypto/dist/ssh/cipher.c
cvs rdiff -u -r1.2.28.1 -r1.2.28.1.2.1 src/crypto/dist/ssh/cipher.h
cvs rdiff -u -r1.30.8.1 -r1.30.8.1.2.1 src/crypto/dist/ssh/packet.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3
diff -u src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3:1.1 src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3:1.1.14.1
--- src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3:1.1 Sat Mar 22 08:37:14 2008
+++ src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3 Wed Apr 21 05:17:36 2010
@@ -30,7 +30,7 @@
.\" 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
@@ -134,7 +134,7 @@
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
Index: src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3
diff -u src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3:1.1 src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3:1.1.14.1
--- src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3:1.1 Sat Mar 22 08:37:14 2008
+++ src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3 Wed Apr 21 05:17:36 2010
@@ -30,7 +30,7 @@
.\" 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
@@ -170,7 +170,7 @@
.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
Index: src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3
diff -u src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3:1.9 src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3:1.9.14.1
--- src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3:1.9 Sat Mar 22 08:37:14 2008
+++ src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3 Wed Apr 21 05:17:36 2010
@@ -30,7 +30,7 @@
.\" 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
@@ -204,7 +204,7 @@
For compatibility with other Kerberos implemtation
.Li WRFILE
and
-.LI JAVA14
+.Li JAVA14
is also accepted.
.Li WRFILE
has the same format as
@@ -380,7 +380,7 @@
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 .
Index: src/crypto/dist/ipsec-tools/src/racoon/handler.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.21.4.1 src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.21.4.1.4.1
--- src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.21.4.1 Sun Feb 8 18:42:16 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/handler.c Wed Apr 21 05:17:36 2010
@@ -1,4 +1,4 @@
-/* $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 */
@@ -478,7 +478,7 @@
{
struct ph2handle *p;
- LIST_FOREACH(p, &ph2tree, chain) {
+ LIST_FOREACH(p, &iph1->ph2tree, ph1bind) {
if (p->msgid == msgid)
return p;
}
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp.c:1.42.4.1 src/crypto/dist/ipsec-tools/src/racoon/isakmp.c:1.42.4.1.4.1
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp.c:1.42.4.1 Sun Feb 8 18:42:16 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp.c Wed Apr 21 05:17:36 2010
@@ -1,4 +1,4 @@
-/* $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 */
@@ -3086,6 +3086,16 @@
}
}
+ /* 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,
Index: src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5
diff -u src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5:1.46.4.1 src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5:1.46.4.1.4.1
--- src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5:1.46.4.1 Sun Feb 8 18:42:18 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5 Wed Apr 21 05:17:36 2010
@@ -1,4 +1,4 @@
-.\" $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
.\"
@@ -574,6 +574,8 @@
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
Index: src/crypto/dist/openssl/crypto/comp/c_zlib.c
diff -u src/crypto/dist/openssl/crypto/comp/c_zlib.c:1.1.1.7 src/crypto/dist/openssl/crypto/comp/c_zlib.c:1.1.1.7.10.1
--- src/crypto/dist/openssl/crypto/comp/c_zlib.c:1.1.1.7 Fri May 9 21:34:23 2008
+++ src/crypto/dist/openssl/crypto/comp/c_zlib.c Wed Apr 21 05:17:37 2010
@@ -136,15 +136,6 @@
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;
@@ -188,6 +179,12 @@
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);
}
@@ -402,7 +399,7 @@
if (zlib_stateful_ex_idx == -1)
zlib_stateful_ex_idx =
CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_COMP,
- 0,NULL,NULL,NULL,zlib_stateful_free_ex_data);
+ 0,NULL,NULL,NULL,NULL);
CRYPTO_w_unlock(CRYPTO_LOCK_COMP);
if (zlib_stateful_ex_idx == -1)
goto err;
Index: src/crypto/dist/openssl/crypto/evp/m_sha1.c
diff -u src/crypto/dist/openssl/crypto/evp/m_sha1.c:1.1.1.5.8.1 src/crypto/dist/openssl/crypto/evp/m_sha1.c:1.1.1.5.8.1.2.1
--- src/crypto/dist/openssl/crypto/evp/m_sha1.c:1.1.1.5.8.1 Tue Jul 14 19:35:22 2009
+++ src/crypto/dist/openssl/crypto/evp/m_sha1.c Wed Apr 21 05:17:37 2010
@@ -158,8 +158,12 @@
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); }
@@ -170,8 +174,8 @@
SHA384_DIGEST_LENGTH,
EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
init384,
- update512,
- final512,
+ update384,
+ final384,
NULL,
NULL,
EVP_PKEY_RSA_method,
Index: src/crypto/dist/openssl/ssl/s3_enc.c
diff -u src/crypto/dist/openssl/ssl/s3_enc.c:1.1.1.12 src/crypto/dist/openssl/ssl/s3_enc.c:1.1.1.12.10.1
--- src/crypto/dist/openssl/ssl/s3_enc.c:1.1.1.12 Fri May 9 21:34:44 2008
+++ src/crypto/dist/openssl/ssl/s3_enc.c Wed Apr 21 05:17:37 2010
@@ -570,7 +570,7 @@
{
BIO_write (s->s3->handshake_buffer,(void *)buf,len);
}
- else
+ else if (s->s3->handshake_dgst != NULL)
{
int i;
for (i=0;i< SSL_MAX_DIGEST;i++)
Index: src/crypto/dist/openssl/ssl/t1_enc.c
diff -u src/crypto/dist/openssl/ssl/t1_enc.c:1.1.1.12 src/crypto/dist/openssl/ssl/t1_enc.c:1.1.1.12.10.1
--- src/crypto/dist/openssl/ssl/t1_enc.c:1.1.1.12 Fri May 9 21:34:46 2008
+++ src/crypto/dist/openssl/ssl/t1_enc.c Wed Apr 21 05:17:37 2010
@@ -750,14 +750,16 @@
if (s->s3->handshake_buffer)
ssl3_digest_cached_records(s);
- for (i=0;i<SSL_MAX_DIGEST;i++)
- {
- if (s->s3->handshake_dgst[i]&&EVP_MD_CTX_type(s->s3->handshake_dgst[i])==md_nid)
- {
- d=s->s3->handshake_dgst[i];
- break;
+ if (s->s3->handshake_dgst) {
+ for (i=0;i<SSL_MAX_DIGEST;i++)
+ {
+ if (s->s3->handshake_dgst[i]&&EVP_MD_CTX_type(s->s3->handshake_dgst[i])==md_nid)
+ {
+ d=s->s3->handshake_dgst[i];
+ break;
+ }
}
- }
+ }
if (!d) {
SSLerr(SSL_F_TLS1_CERT_VERIFY_MAC,SSL_R_NO_REQUIRED_DIGEST);
return 0;
@@ -794,7 +796,8 @@
if (mask & s->s3->tmp.new_cipher->algorithm2)
{
unsigned int hashsize = EVP_MD_size(md);
- if (hashsize > (sizeof buf - (size_t)(q-buf)))
+ if (hashsize > (sizeof buf - (size_t)(q-buf)) ||
+ s->s3->handshake_dgst == NULL)
{
/* internal error: 'buf' is too small for this cipersuite! */
err = 1;
Index: src/crypto/dist/openssl/ssl/s3_lib.c
diff -u src/crypto/dist/openssl/ssl/s3_lib.c:1.14 src/crypto/dist/openssl/ssl/s3_lib.c:1.14.10.1
--- src/crypto/dist/openssl/ssl/s3_lib.c:1.14 Tue Jun 10 19:45:00 2008
+++ src/crypto/dist/openssl/ssl/s3_lib.c Wed Apr 21 05:17:37 2010
@@ -3289,6 +3289,9 @@
if (s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
return(0);
+ if (!(s->s3->flags & SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))
+ return(0);
+
s->s3->renegotiate=1;
return(1);
}
Index: src/crypto/dist/openssl/ssl/s3_pkt.c
diff -u src/crypto/dist/openssl/ssl/s3_pkt.c:1.9.8.1 src/crypto/dist/openssl/ssl/s3_pkt.c:1.9.8.1.2.1
--- src/crypto/dist/openssl/ssl/s3_pkt.c:1.9.8.1 Sun Jul 5 00:31:20 2009
+++ src/crypto/dist/openssl/ssl/s3_pkt.c Wed Apr 21 05:17:37 2010
@@ -313,9 +313,9 @@
if (version != s->version)
{
SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_WRONG_VERSION_NUMBER);
- /* Send back error using their
- * version number :-) */
- s->version=version;
+ if ((s->version & 0xFF00) == (version & 0xFF00))
+ /* Send back error using their minor version number :-) */
+ s->version = (unsigned short)version;
al=SSL_AD_PROTOCOL_VERSION;
goto f_err;
}
@@ -1041,6 +1041,7 @@
if (SSL_is_init_finished(s) &&
!(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) &&
+ (s->s3->flags & SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION) &&
!s->s3->renegotiate)
{
ssl3_renegotiate(s);
@@ -1173,7 +1174,8 @@
if ((s->s3->handshake_fragment_len >= 4) && !s->in_handshake)
{
if (((s->state&SSL_ST_MASK) == SSL_ST_OK) &&
- !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS))
+ !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) &&
+ (s->s3->flags & SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))
{
#if 0 /* worked only because C operator preferences are not as expected (and
* because this is not really needed for clients except for detecting
Index: src/crypto/dist/openssl/ssl/s3_srvr.c
diff -u src/crypto/dist/openssl/ssl/s3_srvr.c:1.15.4.1 src/crypto/dist/openssl/ssl/s3_srvr.c:1.15.4.1.4.1
--- src/crypto/dist/openssl/ssl/s3_srvr.c:1.15.4.1 Tue Jan 20 21:28:09 2009
+++ src/crypto/dist/openssl/ssl/s3_srvr.c Wed Apr 21 05:17:37 2010
@@ -532,12 +532,14 @@
*/
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[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]);
- }
+ if (s->s3->handshake_dgst != NULL) {
+ 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]);
+ }
+ }
}
break;
@@ -763,6 +765,14 @@
#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.
Index: src/crypto/dist/openssl/ssl/ssl_locl.h
diff -u src/crypto/dist/openssl/ssl/ssl_locl.h:1.13 src/crypto/dist/openssl/ssl/ssl_locl.h:1.13.10.1
--- src/crypto/dist/openssl/ssl/ssl_locl.h:1.13 Tue Jun 10 19:45:00 2008
+++ src/crypto/dist/openssl/ssl/ssl_locl.h Wed Apr 21 05:17:37 2010
@@ -450,6 +450,8 @@
#define NAMED_CURVE_TYPE 3
#endif /* OPENSSL_NO_EC */
+#define SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0010
+
typedef struct cert_pkey_st
{
X509 *x509;
Index: src/crypto/dist/ssh/cipher.c
diff -u src/crypto/dist/ssh/cipher.c:1.21.8.1 src/crypto/dist/ssh/cipher.c:1.21.8.1.2.1
--- src/crypto/dist/ssh/cipher.c:1.21.8.1 Mon Jun 29 23:01:24 2009
+++ src/crypto/dist/ssh/cipher.c Wed Apr 21 05:17:37 2010
@@ -1,4 +1,4 @@
-/* $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 <[email protected]>
@@ -37,7 +37,7 @@
*/
#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>
Index: src/crypto/dist/ssh/cipher.h
diff -u src/crypto/dist/ssh/cipher.h:1.2.28.1 src/crypto/dist/ssh/cipher.h:1.2.28.1.2.1
--- src/crypto/dist/ssh/cipher.h:1.2.28.1 Mon Jun 29 23:01:24 2009
+++ src/crypto/dist/ssh/cipher.h Wed Apr 21 05:17:37 2010
@@ -1,4 +1,4 @@
-/* $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 $ */
/*
Index: src/crypto/dist/ssh/packet.c
diff -u src/crypto/dist/ssh/packet.c:1.30.8.1 src/crypto/dist/ssh/packet.c:1.30.8.1.2.1
--- src/crypto/dist/ssh/packet.c:1.30.8.1 Mon Jun 29 23:01:24 2009
+++ src/crypto/dist/ssh/packet.c Wed Apr 21 05:17:37 2010
@@ -1,4 +1,4 @@
-/* $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 <[email protected]>
@@ -39,7 +39,7 @@
*/
#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>
