5 files changed, 179 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 429184be6..17f3e66d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20000326
+ - Better tests for OpenSSL w/ RSAref
+ - Added replacement setenv() function from OpenBSD libc. Suggested by 
+   Ben Lindstrom <mouring@pconline.com>
+
 20000324
  - Released 1.2.3
 
diff --git a/Makefile.in b/Makefile.in
index f517144de..5db02beb6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,7 +31,7 @@ LDFLAGS=-L. @LDFLAGS@
 
 TARGETS=ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS)
 
-LIBOBJS= atomicio.o authfd.o authfile.o bsd-bindresvport.o bsd-daemon.o bsd-misc.o bsd-mktemp.o bsd-rresvport.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o fake-getaddrinfo.o fake-getnameinfo.o fingerprint.o hostfile.o log.o match.o mpaux.o nchan.o packet.o radix.o random.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o xmalloc.o 
+LIBOBJS= atomicio.o authfd.o authfile.o bsd-bindresvport.o bsd-daemon.o bsd-misc.o bsd-mktemp.o bsd-rresvport.o bsd-setenv.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o fake-getaddrinfo.o fake-getnameinfo.o fingerprint.o hostfile.o log.o match.o mpaux.o nchan.o packet.o radix.o random.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o xmalloc.o 
 
 SSHOBJS= ssh.o sshconnect.o log-client.o readconf.o clientloop.o
 
diff --git a/bsd-misc.c b/bsd-misc.c
index 83cb0b85d..dd1f6a476 100644
--- a/bsd-misc.c
+++ b/bsd-misc.c
@@ -139,30 +139,6 @@ void setproctitle(const char *fmt, ...)
 }
 #endif /* !HAVE_SETPROCTITLE */
 
-#ifndef HAVE_SETENV
-int setenv(const char *name, const char *value, int overwrite)
-{
-        char *env_string;
-        int result;
-        
-        /* Don't overwrite existing env. var if overwrite is 0 */
-        if (!overwrite && (getenv(name) != NULL))
-                return(0);
-        
-        env_string = xmalloc(strlen(name) + strlen(value) + 2);
-        sprintf(env_string, "%s=%s", name, value);
-        
-        result = putenv(env_string);
-        
-        /* Putenv doesn't copy the env_string, so we need to keep a copy of it */
-        /* around. This leaks a bit of memory, but it doesn't matter */
-        /* for our (OpenSSH port ) use: setenv is only used twice in ssh-agent */
-/*      xfree(env_string); */
-        
-        return(result); 
-}
-#endif /* !HAVE_SETENV */
-
 #ifndef HAVE_SETLOGIN
 int setlogin(const char *name)
 {
diff --git a/bsd-setenv.c b/bsd-setenv.c
new file mode 100644
index 000000000..f5dbd2770
--- /dev/null
+++ b/bsd-setenv.c
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 1987 Regents of the University of California.
+ * 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
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+#include "config.h"
+#ifndef HAVE_SETENV
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *rcsid = "$OpenBSD: setenv.c,v 1.3 1998/02/02 22:44:53 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdlib.h>
+#include <string.h>
+
+/*
+ * __findenv --
+ *      Returns pointer to value associated with name, if any, else NULL.
+ *      Sets offset to be the offset of the name/value combination in the
+ *      environmental array, for use by setenv(3) and unsetenv(3).
+ *      Explicitly removes '=' in argument name.
+ *
+ *      This routine *should* be a static; don't use it.
+ */
+char *
+__findenv(name, offset)
+        register const char *name;
+        int *offset;
+{
+        extern char **environ;
+        register int len, i;
+        register const char *np;
+        register char **p, *cp;
+
+        if (name == NULL || environ == NULL)
+                return (NULL);
+        for (np = name; *np && *np != '='; ++np)
+                ;
+        len = np - name;
+        for (p = environ; (cp = *p) != NULL; ++p) {
+                for (np = name, i = len; i && *cp; i--)
+                        if (*cp++ != *np++)
+                                break;
+                if (i == 0 && *cp++ == '=') {
+                        *offset = p - environ;
+                        return (cp);
+                }
+        }
+        return (NULL);
+}
+
+/*
+ * setenv --
+ *      Set the value of the environmental variable "name" to be
+ *      "value".  If rewrite is set, replace any current value.
+ */
+int
+setenv(name, value, rewrite)
+        register const char *name;
+        register const char *value;
+        int rewrite;
+{
+        extern char **environ;
+        static int alloced;                     /* if allocated space before */
+        register char *C;
+        int l_value, offset;
+        char *__findenv();
+
+        if (*value == '=')                      /* no `=' in value */
+                ++value;
+        l_value = strlen(value);
+        if ((C = __findenv(name, &offset))) {   /* find if already exists */
+                if (!rewrite)
+                        return (0);
+                if (strlen(C) >= l_value) {     /* old larger; copy over */
+                        while ((*C++ = *value++));
+                        return (0);
+                }
+        } else {                                        /* create new slot */
+                register int    cnt;
+                register char   **P;
+
+                for (P = environ, cnt = 0; *P; ++P, ++cnt);
+                if (alloced) {                  /* just increase size */
+                        P = (char **)realloc((void *)environ,
+                            (size_t)(sizeof(char *) * (cnt + 2)));
+                        if (!P)
+                                return (-1);
+                        environ = P;
+                }
+                else {                          /* get new space */
+                        alloced = 1;            /* copy old entries into it */
+                        P = (char **)malloc((size_t)(sizeof(char *) *
+                            (cnt + 2)));
+                        if (!P)
+                                return (-1);
+                        bcopy(environ, P, cnt * sizeof(char *));
+                        environ = P;
+                }
+                environ[cnt + 1] = NULL;
+                offset = cnt;
+        }
+        for (C = (char *)name; *C && *C != '='; ++C);   /* no `=' in name */
+        if (!(environ[offset] =                 /* name + `=' + value */
+            malloc((size_t)((int)(C - name) + l_value + 2))))
+                return (-1);
+        for (C = environ[offset]; (*C = *name++) && *C != '='; ++C)
+                ;
+        for (*C++ = '='; (*C++ = *value++); )
+                ;
+        return (0);
+}
+
+/*
+ * unsetenv(name) --
+ *      Delete environmental variable "name".
+ */
+void
+unsetenv(name)
+        const char      *name;
+{
+        extern char **environ;
+        register char **P;
+        int offset;
+        char *__findenv();
+
+        while (__findenv(name, &offset))                /* if set multiple times */
+                for (P = &environ[offset];; ++P)
+                        if (!(*P = *(P + 1)))
+                                break;
+}
+
+#endif /* HAVE_SETENV */
diff --git a/bsd-setenv.h b/bsd-setenv.h
new file mode 100644
index 000000000..62ebc201f
--- /dev/null
+++ b/bsd-setenv.h
@@ -0,0 +1,12 @@
+#ifndef _BSD_SETENV_H
+#define _BSD_SETENV_H
+
+#include "config.h"
+
+#ifndef HAVE_SETENV
+
+int setenv(register const char *name, register const char *value, int rewrite);
+
+#endif /* !HAVE_SETENV */
+
+#endif /* _BSD_SETENV_H */