summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-13 08:58:05 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-06-13 08:58:05 +1000
commit0f0ef0ab1f7af50e7f48a8bc06cf3f5fc76654c7 (patch)
treee65560f48034e90633a23be7b907170f701b03fc
parentb68fb4ad2118483c84c02633029e86fc20f15bf1 (diff)
- grunk@cvs.openbsd.org 2008/06/12 22:03:36
[key.c] add my copyright, ok djm@
-rw-r--r--ChangeLog5
-rw-r--r--key.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c1f93fe73..83cb19b88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -133,6 +133,9 @@
133 [ssh-keygen.c] 133 [ssh-keygen.c]
134 make ssh-keygen -lf show the key type just as ssh-add -l would do it 134 make ssh-keygen -lf show the key type just as ssh-add -l would do it
135 ok djm@ markus@ 135 ok djm@ markus@
136 - grunk@cvs.openbsd.org 2008/06/12 22:03:36
137 [key.c]
138 add my copyright, ok djm@
136 - (dtucker) [clientloop.c serverloop.c] channel_register_filter now 139 - (dtucker) [clientloop.c serverloop.c] channel_register_filter now
137 takes 2 more args. with djm@ 140 takes 2 more args. with djm@
138 141
@@ -4297,4 +4300,4 @@
4297 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4300 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4298 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4301 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4299 4302
4300$Id: ChangeLog,v 1.4991 2008/06/12 22:57:27 dtucker Exp $ 4303$Id: ChangeLog,v 1.4992 2008/06/12 22:58:05 dtucker Exp $
diff --git a/key.c b/key.c
index 7a062ea81..f981710a7 100644
--- a/key.c
+++ b/key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: key.c,v 1.75 2008/06/12 06:32:59 grunk Exp $ */ 1/* $OpenBSD: key.c,v 1.76 2008/06/12 22:03:36 grunk Exp $ */
2/* 2/*
3 * read_bignum(): 3 * read_bignum():
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -11,6 +11,7 @@
11 * 11 *
12 * 12 *
13 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 13 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
14 * Copyright (c) 2008 Alexander von Gernler. All rights reserved.
14 * 15 *
15 * Redistribution and use in source and binary forms, with or without 16 * Redistribution and use in source and binary forms, with or without
16 * modification, are permitted provided that the following conditions 17 * modification, are permitted provided that the following conditions