summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-04-09 20:50:26 +1000
committerDamien Miller <djm@mindrot.org>2003-04-09 20:50:26 +1000
commit703ced55bbe66774a73b4dbe1e952cc269c5d3fb (patch)
tree6e2312d42db8348ad969369a15203b8e65fc4af4
parenta5539d2698ea83b4a7f9abe7cde8306e2fd76f33 (diff)
- markus@cvs.openbsd.org 2003/04/02 14:36:26
[ssh-keysign.c] potential segfault if KEY_UNSPEC; cjwatson@debian.org; bug #526
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keysign.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 140a176f2..e611972f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
7 [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c] 7 [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
8 [readconf.h serverloop.c sshconnect2.c] 8 [readconf.h serverloop.c sshconnect2.c]
9 reapply rekeying chage, tested by henning@, ok djm@ 9 reapply rekeying chage, tested by henning@, ok djm@
10 - markus@cvs.openbsd.org 2003/04/02 14:36:26
11 [ssh-keysign.c]
12 potential segfault if KEY_UNSPEC; cjwatson@debian.org; bug #526
10 13
1120030402 1420030402
12 - (bal) if IP_TOS is not found or broken don't try to compile in 15 - (bal) if IP_TOS is not found or broken don't try to compile in
@@ -1309,4 +1312,4 @@
1309 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1312 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1310 ok provos@ 1313 ok provos@
1311 1314
1312$Id: ChangeLog,v 1.2652 2003/04/09 10:50:06 djm Exp $ 1315$Id: ChangeLog,v 1.2653 2003/04/09 10:50:26 djm Exp $
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 26c8faad2..97a76cd9f 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -22,7 +22,7 @@
22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24#include "includes.h" 24#include "includes.h"
25RCSID("$OpenBSD: ssh-keysign.c,v 1.10 2003/03/13 11:42:19 markus Exp $"); 25RCSID("$OpenBSD: ssh-keysign.c,v 1.11 2003/04/02 14:36:26 markus Exp $");
26 26
27#include <openssl/evp.h> 27#include <openssl/evp.h>
28#include <openssl/rand.h> 28#include <openssl/rand.h>
@@ -55,7 +55,7 @@ valid_request(struct passwd *pw, char *host, Key **ret, u_char *data,
55 u_int datalen) 55 u_int datalen)
56{ 56{
57 Buffer b; 57 Buffer b;
58 Key *key; 58 Key *key = NULL;
59 u_char *pkblob; 59 u_char *pkblob;
60 u_int blen, len; 60 u_int blen, len;
61 char *pkalg, *p; 61 char *pkalg, *p;