summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-09-04 16:20:26 +1000
committerDamien Miller <djm@mindrot.org>2002-09-04 16:20:26 +1000
commit6cffb9a8cdc628d5310550265ebd41a4dab0a822 (patch)
tree6e341d54df4d04966c8336db5a53e2a84d79347f
parent3962119c8a07699ef082ef3839b6408135dfc33b (diff)
- markus@cvs.openbsd.org 2002/08/12 10:46:35
[ssh-agent.c] make ssh-agent setgid, disallow ptrace. (note: change not yet made in Makefile)
-rw-r--r--ChangeLog8
-rw-r--r--ssh-agent.c6
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e74810800..42f09d77a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120020903
2 - (djm) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2002/08/12 10:46:35
4 [ssh-agent.c]
5 make ssh-agent setgid, disallow ptrace.
6
120020820 720020820
2 - OpenBSD CVS Sync 8 - OpenBSD CVS Sync
3 - millert@cvs.openbsd.org 2002/08/02 14:43:15 9 - millert@cvs.openbsd.org 2002/08/02 14:43:15
@@ -1538,4 +1544,4 @@
1538 - (stevesk) entropy.c: typo in debug message 1544 - (stevesk) entropy.c: typo in debug message
1539 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1545 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1540 1546
1541$Id: ChangeLog,v 1.2426 2002/08/21 02:54:11 mouring Exp $ 1547$Id: ChangeLog,v 1.2427 2002/09/04 06:20:26 djm Exp $
diff --git a/ssh-agent.c b/ssh-agent.c
index 1f21cbc9b..0615889be 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -35,7 +35,7 @@
35 35
36#include "includes.h" 36#include "includes.h"
37#include "openbsd-compat/fake-queue.h" 37#include "openbsd-compat/fake-queue.h"
38RCSID("$OpenBSD: ssh-agent.c,v 1.98 2002/07/21 18:07:45 stevesk Exp $"); 38RCSID("$OpenBSD: ssh-agent.c,v 1.99 2002/08/12 10:46:35 markus Exp $");
39 39
40#include <openssl/evp.h> 40#include <openssl/evp.h>
41#include <openssl/md5.h> 41#include <openssl/md5.h>
@@ -943,6 +943,10 @@ main(int ac, char **av)
943 pid_t pid; 943 pid_t pid;
944 char pidstrbuf[1 + 3 * sizeof pid]; 944 char pidstrbuf[1 + 3 * sizeof pid];
945 945
946 /* drop */
947 setegid(getgid());
948 setgid(getgid());
949
946 SSLeay_add_all_algorithms(); 950 SSLeay_add_all_algorithms();
947 951
948 __progname = get_progname(av[0]); 952 __progname = get_progname(av[0]);