diff options
| author | Gary Ching-Pang Lin <glin@suse.com> | 2015-05-12 13:51:02 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2015-05-12 13:51:02 -0400 |
| commit | f3653b08a475372a0849cd9a3387a5997ce121c9 (patch) | |
| tree | a3149decea22d31dfe81cc7054f55d65fc45f46a /Cryptlib/OpenSSL/crypto/uid.c | |
| parent | f3af1acfec86794ae2d78f63cab100503bfc9a7b (diff) | |
| download | efi-boot-shim-f3653b08a475372a0849cd9a3387a5997ce121c9.tar.gz efi-boot-shim-f3653b08a475372a0849cd9a3387a5997ce121c9.zip | |
Update Cryptlib and openssl
Update Cryptlib to r16559 and openssl to 0.9.8zf
Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/uid.c')
| -rw-r--r-- | Cryptlib/OpenSSL/crypto/uid.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/Cryptlib/OpenSSL/crypto/uid.c b/Cryptlib/OpenSSL/crypto/uid.c index b1fd52ba..90694c67 100644 --- a/Cryptlib/OpenSSL/crypto/uid.c +++ b/Cryptlib/OpenSSL/crypto/uid.c @@ -7,7 +7,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * 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 @@ -58,32 +58,31 @@ #if defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ > 2) -#include OPENSSL_UNISTD +# include OPENSSL_UNISTD int OPENSSL_issetugid(void) - { - return issetugid(); - } +{ + return issetugid(); +} #elif defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) int OPENSSL_issetugid(void) - { - return 0; - } +{ + return 0; +} #else -#include OPENSSL_UNISTD -#include <sys/types.h> +# include OPENSSL_UNISTD +# include <sys/types.h> int OPENSSL_issetugid(void) - { - if (getuid() != geteuid()) return 1; - if (getgid() != getegid()) return 1; - return 0; - } +{ + if (getuid() != geteuid()) + return 1; + if (getgid() != getegid()) + return 1; + return 0; +} #endif - - - |