New function OPENSSL_issetugid(). Needs more work. (36fafffa) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/crypto.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -279,6 +279,8 @@ int CRYPTO_is_mem_check_on(void);
		const char *SSLeay_version(int type);
		unsigned long SSLeay(void);

		int OPENSSL_issetugid(void);

		int CRYPTO_get_ex_new_index(int idx, STACK_OF(CRYPTO_EX_DATA_FUNCS) *skp, long argl, void argp,
		CRYPTO_EX_new new_func, CRYPTO_EX_dup dup_func, CRYPTO_EX_free *free_func);
		int CRYPTO_set_ex_data(CRYPTO_EX_DATA ad, int idx, void val);

crypto/rand/randfile.c

+14 −10

Original line number	Diff line number	Diff line
		@@ -196,9 +196,10 @@ err:

		const char RAND_file_name(char buf, int size)
		{
		char *s;
		char *s=NULL;
		char *ret=NULL;

		if (OPENSSL_issetugid() == 0)
		s=getenv("RANDFILE");
		if (s != NULL)
		{
		@@ -208,10 +209,10 @@ const char RAND_file_name(char buf, int size)
		}
		else
		{
		if (OPENSSL_issetugid() == 0)
		s=getenv("HOME");
		if (s == NULL) return(RFILE);
		if (((int)(strlen(s)+strlen(RFILE)+2)) > size)
		return(RFILE);
		if (s != NULL && (strlen(s)+strlen(RFILE)+2 < size))
		{
		strcpy(buf,s);
		#ifndef VMS
		strcat(buf,"/");
		@@ -219,5 +220,8 @@ const char RAND_file_name(char buf, int size)
		strcat(buf,RFILE);
		ret=buf;
		}
		else
		buf[0] = '\0'; /* no file name */
		}
		return(ret);
		}

crypto/uid.c

0 → 100644

+88 −0

Original line number	Diff line number	Diff line
		/* crypto/uid.c */
		/* ====================================================================
		* Copyright (c) 2001 The OpenSSL Project. 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 acknowledgment:
		* "This product includes software developed by the OpenSSL Project
		* for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
		*
		* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
		* endorse or promote products derived from this software without
		* prior written permission. For written permission, please contact
		* licensing@OpenSSL.org.
		*
		* 5. Products derived from this software may not be called "OpenSSL"
		* nor may "OpenSSL" appear in their names without prior written
		* permission of the OpenSSL Project.
		*
		* 6. Redistributions of any form whatsoever must retain the following
		* acknowledgment:
		* "This product includes software developed by the OpenSSL Project
		* for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
		*
		* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
		* EXPRESSED 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 OpenSSL PROJECT OR
		* ITS 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.
		* ====================================================================
		*
		* This product includes cryptographic software written by Eric Young
		* (eay@cryptsoft.com). This product includes software written by Tim
		* Hudson (tjh@cryptsoft.com).
		*
		*/

		#include "openssl/crypto.h"

		#if defined(__OpenBSD__) \|\| (defined(__FreeBSD__) && __FreeBSD__ > 2)

		#include <unistd.h>

		int OPENSSL_issetugid(void)
		{
		return issetugid();
		}

		#elsif defined(WIN32)

		int OPENSSL_issetugid(void)
		{
		return 0;
		}

		#else

		#include <unistd.h>
		#include <sys/types.h>

		int OPENSSL_issetugid(void)
		{
		if (getuid() != geteuid()) return 1;
		if (getgid() != getegid()) return 1;
		return 0;
		}
		#endif