aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libtirpc/libtirpc-0.2.3/libtirpc-0.2.3-add-missing-bits-from-glibc.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/libtirpc/libtirpc-0.2.3/libtirpc-0.2.3-add-missing-bits-from-glibc.patch')
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc-0.2.3/libtirpc-0.2.3-add-missing-bits-from-glibc.patch1766
1 files changed, 1766 insertions, 0 deletions
diff --git a/meta/recipes-extended/libtirpc/libtirpc-0.2.3/libtirpc-0.2.3-add-missing-bits-from-glibc.patch b/meta/recipes-extended/libtirpc/libtirpc-0.2.3/libtirpc-0.2.3-add-missing-bits-from-glibc.patch
new file mode 100644
index 0000000000..43a093b8d6
--- /dev/null
+++ b/meta/recipes-extended/libtirpc/libtirpc-0.2.3/libtirpc-0.2.3-add-missing-bits-from-glibc.patch
@@ -0,0 +1,1766 @@
+diff -urN libtirpc-0.2.3/src/des_crypt.c libtirpc-0.2.3.new/src/des_crypt.c
+--- libtirpc-0.2.3/src/des_crypt.c 2013-02-13 16:13:59.000000000 +0100
++++ libtirpc-0.2.3.new/src/des_crypt.c 2013-03-19 12:24:24.368923058 +0100
+@@ -1,66 +1,60 @@
+ /*
+- * Copyright (c) 2009, Sun Microsystems, Inc.
+- * All rights reserved.
++ * des_crypt.c, DES encryption library routines
++ * Copyright (c) 2010, Oracle America, Inc.
++ * Adaption to work inside tirpc rather than glibc
++ * (c) 2012 Bernhard Rosenkraenzer <bero@lindev.ch>
+ *
+ * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions are met:
+- * - Redistributions of source code must retain the above copyright notice,
+- * this list of conditions and the following disclaimer.
+- * - 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.
+- * - Neither the name of Sun Microsystems, Inc. nor the names of its
+- * contributors may be used to endorse or promote products derived
+- * from this software without specific prior written permission.
++ * modification, are permitted provided that the following conditions are
++ * met:
+ *
+- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
+- */
+-/*
+- * des_crypt.c, DES encryption library routines
+- * Copyright (C) 1986, Sun Microsystems, Inc.
++ * * Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * * 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.
++ * * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
++ * COPYRIGHT HOLDER 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 <sys/types.h>
+-#include <rpc/types.h>
+ #include <rpc/des_crypt.h>
+-#include <rpc/des.h>
+-#if 0
+-#ifndef lint
+-static char sccsid[] = "@(#)des_crypt.c 2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
+-#endif
+-#endif
+-#include <sys/cdefs.h>
+-
+-static int common_crypt( char *, char *, unsigned, unsigned, struct desparams * );
+-int (*__des_crypt_LOCAL)() = 0;
+-extern int _des_crypt_call(char *, int, struct desparams *);
++#include <rpc/rpc_des.h>
++
++extern int _des_crypt (char *, unsigned, struct desparams *);
++
+ /*
+ * Copy 8 bytes
+ */
+ #define COPY8(src, dst) { \
+- char *a = (char *) dst; \
+- char *b = (char *) src; \
++ register char *a = (char *) dst; \
++ register char *b = (char *) src; \
+ *a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
+ *a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
+ }
+-
++
+ /*
+ * Copy multiple of 8 bytes
+ */
+ #define DESCOPY(src, dst, len) { \
+- char *a = (char *) dst; \
+- char *b = (char *) src; \
+- int i; \
++ register char *a = (char *) dst; \
++ register char *b = (char *) src; \
++ register int i; \
+ for (i = (int) len; i > 0; i -= 8) { \
+ *a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
+ *a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
+@@ -68,87 +62,56 @@
+ }
+
+ /*
+- * CBC mode encryption
++ * Common code to cbc_crypt() & ecb_crypt()
+ */
+-int
+-cbc_crypt(key, buf, len, mode, ivec)
+- char *key;
+- char *buf;
+- unsigned len;
+- unsigned mode;
+- char *ivec;
++static int
++common_crypt (char *key, char *buf, register unsigned len,
++ unsigned mode, register struct desparams *desp)
+ {
+- int err;
+- struct desparams dp;
++ register int desdev;
+
+-#ifdef BROKEN_DES
+- dp.UDES.UDES_buf = buf;
+- dp.des_mode = ECB;
+-#else
+- dp.des_mode = CBC;
+-#endif
+- COPY8(ivec, dp.des_ivec);
+- err = common_crypt(key, buf, len, mode, &dp);
+- COPY8(dp.des_ivec, ivec);
+- return(err);
+-}
++ if ((len % 8) != 0 || len > DES_MAXDATA)
++ return DESERR_BADPARAM;
++
++ desp->des_dir =
++ ((mode & DES_DIRMASK) == DES_ENCRYPT) ? ENCRYPT : DECRYPT;
++
++ desdev = mode & DES_DEVMASK;
++ COPY8 (key, desp->des_key);
++ /*
++ * software
++ */
++ if (!_des_crypt (buf, len, desp))
++ return DESERR_HWERROR;
+
++ return desdev == DES_SW ? DESERR_NONE : DESERR_NOHWDEVICE;
++}
+
+ /*
+- * ECB mode encryption
++ * CBC mode encryption
+ */
+ int
+-ecb_crypt(key, buf, len, mode)
+- char *key;
+- char *buf;
+- unsigned len;
+- unsigned mode;
++cbc_crypt (char *key, char *buf, unsigned int len, unsigned int mode,
++ char *ivec)
+ {
+- struct desparams dp;
++ int err;
++ struct desparams dp;
+
+-#ifdef BROKEN_DES
+- dp.UDES.UDES_buf = buf;
+- dp.des_mode = CBC;
+-#else
+- dp.des_mode = ECB;
+-#endif
+- return(common_crypt(key, buf, len, mode, &dp));
++ dp.des_mode = CBC;
++ COPY8 (ivec, dp.des_ivec);
++ err = common_crypt (key, buf, len, mode, &dp);
++ COPY8 (dp.des_ivec, ivec);
++ return err;
+ }
+
+-
+-
+ /*
+- * Common code to cbc_crypt() & ecb_crypt()
++ * ECB mode encryption
+ */
+-static int
+-common_crypt(key, buf, len, mode, desp)
+- char *key;
+- char *buf;
+- unsigned len;
+- unsigned mode;
+- struct desparams *desp;
++int
++ecb_crypt (char *key, char *buf, unsigned int len, unsigned int mode)
+ {
+- int desdev;
++ struct desparams dp;
+
+- if ((len % 8) != 0 || len > DES_MAXDATA) {
+- return(DESERR_BADPARAM);
+- }
+- desp->des_dir =
+- ((mode & DES_DIRMASK) == DES_ENCRYPT) ? ENCRYPT : DECRYPT;
+-
+- desdev = mode & DES_DEVMASK;
+- COPY8(key, desp->des_key);
+- /*
+- * software
+- */
+- if (__des_crypt_LOCAL != NULL) {
+- if (!__des_crypt_LOCAL(buf, len, desp)) {
+- return (DESERR_HWERROR);
+- }
+- } else {
+- if (!_des_crypt_call(buf, len, desp)) {
+- return (DESERR_HWERROR);
+- }
+- }
+- return(desdev == DES_SW ? DESERR_NONE : DESERR_NOHWDEVICE);
++ dp.des_mode = ECB;
++ return common_crypt (key, buf, len, mode, &dp);
+ }
+diff -urN libtirpc-0.2.3/src/des_impl.c libtirpc-0.2.3.new/src/des_impl.c
+--- libtirpc-0.2.3/src/des_impl.c 1970-01-01 01:00:00.000000000 +0100
++++ libtirpc-0.2.3.new/src/des_impl.c 2013-03-19 12:24:24.368923058 +0100
+@@ -0,0 +1,593 @@
++/* Copyright (C) 1992 Eric Young */
++/* Collected from libdes and modified for SECURE RPC by Martin Kuck 1994 */
++/* This file is distributed under the terms of the GNU Lesser General */
++/* Public License, version 2.1 or later - see the file COPYING.LIB for details.*/
++/* If you did not receive a copy of the license with this program, please*/
++/* see <http://www.gnu.org/licenses/> to obtain a copy. */
++#include <string.h>
++#include <stdint.h>
++#include <rpc/rpc_des.h>
++
++
++static const uint32_t des_SPtrans[8][64] =
++{
++ { /* nibble 0 */
++ 0x00820200, 0x00020000, 0x80800000, 0x80820200,
++ 0x00800000, 0x80020200, 0x80020000, 0x80800000,
++ 0x80020200, 0x00820200, 0x00820000, 0x80000200,
++ 0x80800200, 0x00800000, 0x00000000, 0x80020000,
++ 0x00020000, 0x80000000, 0x00800200, 0x00020200,
++ 0x80820200, 0x00820000, 0x80000200, 0x00800200,
++ 0x80000000, 0x00000200, 0x00020200, 0x80820000,
++ 0x00000200, 0x80800200, 0x80820000, 0x00000000,
++ 0x00000000, 0x80820200, 0x00800200, 0x80020000,
++ 0x00820200, 0x00020000, 0x80000200, 0x00800200,
++ 0x80820000, 0x00000200, 0x00020200, 0x80800000,
++ 0x80020200, 0x80000000, 0x80800000, 0x00820000,
++ 0x80820200, 0x00020200, 0x00820000, 0x80800200,
++ 0x00800000, 0x80000200, 0x80020000, 0x00000000,
++ 0x00020000, 0x00800000, 0x80800200, 0x00820200,
++ 0x80000000, 0x80820000, 0x00000200, 0x80020200},
++
++ { /* nibble 1 */
++ 0x10042004, 0x00000000, 0x00042000, 0x10040000,
++ 0x10000004, 0x00002004, 0x10002000, 0x00042000,
++ 0x00002000, 0x10040004, 0x00000004, 0x10002000,
++ 0x00040004, 0x10042000, 0x10040000, 0x00000004,
++ 0x00040000, 0x10002004, 0x10040004, 0x00002000,
++ 0x00042004, 0x10000000, 0x00000000, 0x00040004,
++ 0x10002004, 0x00042004, 0x10042000, 0x10000004,
++ 0x10000000, 0x00040000, 0x00002004, 0x10042004,
++ 0x00040004, 0x10042000, 0x10002000, 0x00042004,
++ 0x10042004, 0x00040004, 0x10000004, 0x00000000,
++ 0x10000000, 0x00002004, 0x00040000, 0x10040004,
++ 0x00002000, 0x10000000, 0x00042004, 0x10002004,
++ 0x10042000, 0x00002000, 0x00000000, 0x10000004,
++ 0x00000004, 0x10042004, 0x00042000, 0x10040000,
++ 0x10040004, 0x00040000, 0x00002004, 0x10002000,
++ 0x10002004, 0x00000004, 0x10040000, 0x00042000},
++
++ { /* nibble 2 */
++ 0x41000000, 0x01010040, 0x00000040, 0x41000040,
++ 0x40010000, 0x01000000, 0x41000040, 0x00010040,
++ 0x01000040, 0x00010000, 0x01010000, 0x40000000,
++ 0x41010040, 0x40000040, 0x40000000, 0x41010000,
++ 0x00000000, 0x40010000, 0x01010040, 0x00000040,
++ 0x40000040, 0x41010040, 0x00010000, 0x41000000,
++ 0x41010000, 0x01000040, 0x40010040, 0x01010000,
++ 0x00010040, 0x00000000, 0x01000000, 0x40010040,
++ 0x01010040, 0x00000040, 0x40000000, 0x00010000,
++ 0x40000040, 0x40010000, 0x01010000, 0x41000040,
++ 0x00000000, 0x01010040, 0x00010040, 0x41010000,
++ 0x40010000, 0x01000000, 0x41010040, 0x40000000,
++ 0x40010040, 0x41000000, 0x01000000, 0x41010040,
++ 0x00010000, 0x01000040, 0x41000040, 0x00010040,
++ 0x01000040, 0x00000000, 0x41010000, 0x40000040,
++ 0x41000000, 0x40010040, 0x00000040, 0x01010000},
++
++ { /* nibble 3 */
++ 0x00100402, 0x04000400, 0x00000002, 0x04100402,
++ 0x00000000, 0x04100000, 0x04000402, 0x00100002,
++ 0x04100400, 0x04000002, 0x04000000, 0x00000402,
++ 0x04000002, 0x00100402, 0x00100000, 0x04000000,
++ 0x04100002, 0x00100400, 0x00000400, 0x00000002,
++ 0x00100400, 0x04000402, 0x04100000, 0x00000400,
++ 0x00000402, 0x00000000, 0x00100002, 0x04100400,
++ 0x04000400, 0x04100002, 0x04100402, 0x00100000,
++ 0x04100002, 0x00000402, 0x00100000, 0x04000002,
++ 0x00100400, 0x04000400, 0x00000002, 0x04100000,
++ 0x04000402, 0x00000000, 0x00000400, 0x00100002,
++ 0x00000000, 0x04100002, 0x04100400, 0x00000400,
++ 0x04000000, 0x04100402, 0x00100402, 0x00100000,
++ 0x04100402, 0x00000002, 0x04000400, 0x00100402,
++ 0x00100002, 0x00100400, 0x04100000, 0x04000402,
++ 0x00000402, 0x04000000, 0x04000002, 0x04100400},
++
++ { /* nibble 4 */
++ 0x02000000, 0x00004000, 0x00000100, 0x02004108,
++ 0x02004008, 0x02000100, 0x00004108, 0x02004000,
++ 0x00004000, 0x00000008, 0x02000008, 0x00004100,
++ 0x02000108, 0x02004008, 0x02004100, 0x00000000,
++ 0x00004100, 0x02000000, 0x00004008, 0x00000108,
++ 0x02000100, 0x00004108, 0x00000000, 0x02000008,
++ 0x00000008, 0x02000108, 0x02004108, 0x00004008,
++ 0x02004000, 0x00000100, 0x00000108, 0x02004100,
++ 0x02004100, 0x02000108, 0x00004008, 0x02004000,
++ 0x00004000, 0x00000008, 0x02000008, 0x02000100,
++ 0x02000000, 0x00004100, 0x02004108, 0x00000000,
++ 0x00004108, 0x02000000, 0x00000100, 0x00004008,
++ 0x02000108, 0x00000100, 0x00000000, 0x02004108,
++ 0x02004008, 0x02004100, 0x00000108, 0x00004000,
++ 0x00004100, 0x02004008, 0x02000100, 0x00000108,
++ 0x00000008, 0x00004108, 0x02004000, 0x02000008},
++
++ { /* nibble 5 */
++ 0x20000010, 0x00080010, 0x00000000, 0x20080800,
++ 0x00080010, 0x00000800, 0x20000810, 0x00080000,
++ 0x00000810, 0x20080810, 0x00080800, 0x20000000,
++ 0x20000800, 0x20000010, 0x20080000, 0x00080810,
++ 0x00080000, 0x20000810, 0x20080010, 0x00000000,
++ 0x00000800, 0x00000010, 0x20080800, 0x20080010,
++ 0x20080810, 0x20080000, 0x20000000, 0x00000810,
++ 0x00000010, 0x00080800, 0x00080810, 0x20000800,
++ 0x00000810, 0x20000000, 0x20000800, 0x00080810,
++ 0x20080800, 0x00080010, 0x00000000, 0x20000800,
++ 0x20000000, 0x00000800, 0x20080010, 0x00080000,
++ 0x00080010, 0x20080810, 0x00080800, 0x00000010,
++ 0x20080810, 0x00080800, 0x00080000, 0x20000810,
++ 0x20000010, 0x20080000, 0x00080810, 0x00000000,
++ 0x00000800, 0x20000010, 0x20000810, 0x20080800,
++ 0x20080000, 0x00000810, 0x00000010, 0x20080010},
++
++ { /* nibble 6 */
++ 0x00001000, 0x00000080, 0x00400080, 0x00400001,
++ 0x00401081, 0x00001001, 0x00001080, 0x00000000,
++ 0x00400000, 0x00400081, 0x00000081, 0x00401000,
++ 0x00000001, 0x00401080, 0x00401000, 0x00000081,
++ 0x00400081, 0x00001000, 0x00001001, 0x00401081,
++ 0x00000000, 0x00400080, 0x00400001, 0x00001080,
++ 0x00401001, 0x00001081, 0x00401080, 0x00000001,
++ 0x00001081, 0x00401001, 0x00000080, 0x00400000,
++ 0x00001081, 0x00401000, 0x00401001, 0x00000081,
++ 0x00001000, 0x00000080, 0x00400000, 0x00401001,
++ 0x00400081, 0x00001081, 0x00001080, 0x00000000,
++ 0x00000080, 0x00400001, 0x00000001, 0x00400080,
++ 0x00000000, 0x00400081, 0x00400080, 0x00001080,
++ 0x00000081, 0x00001000, 0x00401081, 0x00400000,
++ 0x00401080, 0x00000001, 0x00001001, 0x00401081,
++ 0x00400001, 0x00401080, 0x00401000, 0x00001001},
++
++ { /* nibble 7 */
++ 0x08200020, 0x08208000, 0x00008020, 0x00000000,
++ 0x08008000, 0x00200020, 0x08200000, 0x08208020,
++ 0x00000020, 0x08000000, 0x00208000, 0x00008020,
++ 0x00208020, 0x08008020, 0x08000020, 0x08200000,
++ 0x00008000, 0x00208020, 0x00200020, 0x08008000,
++ 0x08208020, 0x08000020, 0x00000000, 0x00208000,
++ 0x08000000, 0x00200000, 0x08008020, 0x08200020,
++ 0x00200000, 0x00008000, 0x08208000, 0x00000020,
++ 0x00200000, 0x00008000, 0x08000020, 0x08208020,
++ 0x00008020, 0x08000000, 0x00000000, 0x00208000,
++ 0x08200020, 0x08008020, 0x08008000, 0x00200020,
++ 0x08208000, 0x00000020, 0x00200020, 0x08008000,
++ 0x08208020, 0x00200000, 0x08200000, 0x08000020,
++ 0x00208000, 0x00008020, 0x08008020, 0x08200000,
++ 0x00000020, 0x08208000, 0x00208020, 0x00000000,
++ 0x08000000, 0x08200020, 0x00008000, 0x00208020}};
++
++static const uint32_t des_skb[8][64] =
++{
++ { /* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
++ 0x00000000, 0x00000010, 0x20000000, 0x20000010,
++ 0x00010000, 0x00010010, 0x20010000, 0x20010010,
++ 0x00000800, 0x00000810, 0x20000800, 0x20000810,
++ 0x00010800, 0x00010810, 0x20010800, 0x20010810,
++ 0x00000020, 0x00000030, 0x20000020, 0x20000030,
++ 0x00010020, 0x00010030, 0x20010020, 0x20010030,
++ 0x00000820, 0x00000830, 0x20000820, 0x20000830,
++ 0x00010820, 0x00010830, 0x20010820, 0x20010830,
++ 0x00080000, 0x00080010, 0x20080000, 0x20080010,
++ 0x00090000, 0x00090010, 0x20090000, 0x20090010,
++ 0x00080800, 0x00080810, 0x20080800, 0x20080810,
++ 0x00090800, 0x00090810, 0x20090800, 0x20090810,
++ 0x00080020, 0x00080030, 0x20080020, 0x20080030,
++ 0x00090020, 0x00090030, 0x20090020, 0x20090030,
++ 0x00080820, 0x00080830, 0x20080820, 0x20080830,
++ 0x00090820, 0x00090830, 0x20090820, 0x20090830},
++ { /* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */
++ 0x00000000, 0x02000000, 0x00002000, 0x02002000,
++ 0x00200000, 0x02200000, 0x00202000, 0x02202000,
++ 0x00000004, 0x02000004, 0x00002004, 0x02002004,
++ 0x00200004, 0x02200004, 0x00202004, 0x02202004,
++ 0x00000400, 0x02000400, 0x00002400, 0x02002400,
++ 0x00200400, 0x02200400, 0x00202400, 0x02202400,
++ 0x00000404, 0x02000404, 0x00002404, 0x02002404,
++ 0x00200404, 0x02200404, 0x00202404, 0x02202404,
++ 0x10000000, 0x12000000, 0x10002000, 0x12002000,
++ 0x10200000, 0x12200000, 0x10202000, 0x12202000,
++ 0x10000004, 0x12000004, 0x10002004, 0x12002004,
++ 0x10200004, 0x12200004, 0x10202004, 0x12202004,
++ 0x10000400, 0x12000400, 0x10002400, 0x12002400,
++ 0x10200400, 0x12200400, 0x10202400, 0x12202400,
++ 0x10000404, 0x12000404, 0x10002404, 0x12002404,
++ 0x10200404, 0x12200404, 0x10202404, 0x12202404},
++ { /* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */
++ 0x00000000, 0x00000001, 0x00040000, 0x00040001,
++ 0x01000000, 0x01000001, 0x01040000, 0x01040001,
++ 0x00000002, 0x00000003, 0x00040002, 0x00040003,
++ 0x01000002, 0x01000003, 0x01040002, 0x01040003,
++ 0x00000200, 0x00000201, 0x00040200, 0x00040201,
++ 0x01000200, 0x01000201, 0x01040200, 0x01040201,
++ 0x00000202, 0x00000203, 0x00040202, 0x00040203,
++ 0x01000202, 0x01000203, 0x01040202, 0x01040203,
++ 0x08000000, 0x08000001, 0x08040000, 0x08040001,
++ 0x09000000, 0x09000001, 0x09040000, 0x09040001,
++ 0x08000002, 0x08000003, 0x08040002, 0x08040003,
++ 0x09000002, 0x09000003, 0x09040002, 0x09040003,
++ 0x08000200, 0x08000201, 0x08040200, 0x08040201,
++ 0x09000200, 0x09000201, 0x09040200, 0x09040201,
++ 0x08000202, 0x08000203, 0x08040202, 0x08040203,
++ 0x09000202, 0x09000203, 0x09040202, 0x09040203},
++ { /* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */
++ 0x00000000, 0x00100000, 0x00000100, 0x00100100,
++ 0x00000008, 0x00100008, 0x00000108, 0x00100108,
++ 0x00001000, 0x00101000, 0x00001100, 0x00101100,
++ 0x00001008, 0x00101008, 0x00001108, 0x00101108,
++ 0x04000000, 0x04100000, 0x04000100, 0x04100100,
++ 0x04000008, 0x04100008, 0x04000108, 0x04100108,
++ 0x04001000, 0x04101000, 0x04001100, 0x04101100,
++ 0x04001008, 0x04101008, 0x04001108, 0x04101108,
++ 0x00020000, 0x00120000, 0x00020100, 0x00120100,
++ 0x00020008, 0x00120008, 0x00020108, 0x00120108,
++ 0x00021000, 0x00121000, 0x00021100, 0x00121100,
++ 0x00021008, 0x00121008, 0x00021108, 0x00121108,
++ 0x04020000, 0x04120000, 0x04020100, 0x04120100,
++ 0x04020008, 0x04120008, 0x04020108, 0x04120108,
++ 0x04021000, 0x04121000, 0x04021100, 0x04121100,
++ 0x04021008, 0x04121008, 0x04021108, 0x04121108},
++ { /* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
++ 0x00000000, 0x10000000, 0x00010000, 0x10010000,
++ 0x00000004, 0x10000004, 0x00010004, 0x10010004,
++ 0x20000000, 0x30000000, 0x20010000, 0x30010000,
++ 0x20000004, 0x30000004, 0x20010004, 0x30010004,
++ 0x00100000, 0x10100000, 0x00110000, 0x10110000,
++ 0x00100004, 0x10100004, 0x00110004, 0x10110004,
++ 0x20100000, 0x30100000, 0x20110000, 0x30110000,
++ 0x20100004, 0x30100004, 0x20110004, 0x30110004,
++ 0x00001000, 0x10001000, 0x00011000, 0x10011000,
++ 0x00001004, 0x10001004, 0x00011004, 0x10011004,
++ 0x20001000, 0x30001000, 0x20011000, 0x30011000,
++ 0x20001004, 0x30001004, 0x20011004, 0x30011004,
++ 0x00101000, 0x10101000, 0x00111000, 0x10111000,
++ 0x00101004, 0x10101004, 0x00111004, 0x10111004,
++ 0x20101000, 0x30101000, 0x20111000, 0x30111000,
++ 0x20101004, 0x30101004, 0x20111004, 0x30111004},
++ { /* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */
++ 0x00000000, 0x08000000, 0x00000008, 0x08000008,
++ 0x00000400, 0x08000400, 0x00000408, 0x08000408,
++ 0x00020000, 0x08020000, 0x00020008, 0x08020008,
++ 0x00020400, 0x08020400, 0x00020408, 0x08020408,
++ 0x00000001, 0x08000001, 0x00000009, 0x08000009,
++ 0x00000401, 0x08000401, 0x00000409, 0x08000409,
++ 0x00020001, 0x08020001, 0x00020009, 0x08020009,
++ 0x00020401, 0x08020401, 0x00020409, 0x08020409,
++ 0x02000000, 0x0A000000, 0x02000008, 0x0A000008,
++ 0x02000400, 0x0A000400, 0x02000408, 0x0A000408,
++ 0x02020000, 0x0A020000, 0x02020008, 0x0A020008,
++ 0x02020400, 0x0A020400, 0x02020408, 0x0A020408,
++ 0x02000001, 0x0A000001, 0x02000009, 0x0A000009,
++ 0x02000401, 0x0A000401, 0x02000409, 0x0A000409,
++ 0x02020001, 0x0A020001, 0x02020009, 0x0A020009,
++ 0x02020401, 0x0A020401, 0x02020409, 0x0A020409},
++ { /* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */
++ 0x00000000, 0x00000100, 0x00080000, 0x00080100,
++ 0x01000000, 0x01000100, 0x01080000, 0x01080100,
++ 0x00000010, 0x00000110, 0x00080010, 0x00080110,
++ 0x01000010, 0x01000110, 0x01080010, 0x01080110,
++ 0x00200000, 0x00200100, 0x00280000, 0x00280100,
++ 0x01200000, 0x01200100, 0x01280000, 0x01280100,
++ 0x00200010, 0x00200110, 0x00280010, 0x00280110,
++ 0x01200010, 0x01200110, 0x01280010, 0x01280110,
++ 0x00000200, 0x00000300, 0x00080200, 0x00080300,
++ 0x01000200, 0x01000300, 0x01080200, 0x01080300,
++ 0x00000210, 0x00000310, 0x00080210, 0x00080310,
++ 0x01000210, 0x01000310, 0x01080210, 0x01080310,
++ 0x00200200, 0x00200300, 0x00280200, 0x00280300,
++ 0x01200200, 0x01200300, 0x01280200, 0x01280300,
++ 0x00200210, 0x00200310, 0x00280210, 0x00280310,
++ 0x01200210, 0x01200310, 0x01280210, 0x01280310},
++ { /* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */
++ 0x00000000, 0x04000000, 0x00040000, 0x04040000,
++ 0x00000002, 0x04000002, 0x00040002, 0x04040002,
++ 0x00002000, 0x04002000, 0x00042000, 0x04042000,
++ 0x00002002, 0x04002002, 0x00042002, 0x04042002,
++ 0x00000020, 0x04000020, 0x00040020, 0x04040020,
++ 0x00000022, 0x04000022, 0x00040022, 0x04040022,
++ 0x00002020, 0x04002020, 0x00042020, 0x04042020,
++ 0x00002022, 0x04002022, 0x00042022, 0x04042022,
++ 0x00000800, 0x04000800, 0x00040800, 0x04040800,
++ 0x00000802, 0x04000802, 0x00040802, 0x04040802,
++ 0x00002800, 0x04002800, 0x00042800, 0x04042800,
++ 0x00002802, 0x04002802, 0x00042802, 0x04042802,
++ 0x00000820, 0x04000820, 0x00040820, 0x04040820,
++ 0x00000822, 0x04000822, 0x00040822, 0x04040822,
++ 0x00002820, 0x04002820, 0x00042820, 0x04042820,
++ 0x00002822, 0x04002822, 0x00042822, 0x04042822},
++};
++
++#define c2l(c,l) (l =((unsigned long)(*((c)++))) , \
++ l|=((unsigned long)(*((c)++)))<< 8, \
++ l|=((unsigned long)(*((c)++)))<<16, \
++ l|=((unsigned long)(*((c)++)))<<24)
++
++#define l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \
++ *((c)++)=(unsigned char)(((l)>> 8)&0xff), \
++ *((c)++)=(unsigned char)(((l)>>16)&0xff), \
++ *((c)++)=(unsigned char)(((l)>>24)&0xff))
++
++/*
++ * IP and FP
++ * The problem is more of a geometric problem that random bit fiddling.
++ * 0 1 2 3 4 5 6 7 62 54 46 38 30 22 14 6
++ * 8 9 10 11 12 13 14 15 60 52 44 36 28 20 12 4
++ * 16 17 18 19 20 21 22 23 58 50 42 34 26 18 10 2
++ * 24 25 26 27 28 29 30 31 to 56 48 40 32 24 16 8 0
++ *
++ * 32 33 34 35 36 37 38 39 63 55 47 39 31 23 15 7
++ * 40 41 42 43 44 45 46 47 61 53 45 37 29 21 13 5
++ * 48 49 50 51 52 53 54 55 59 51 43 35 27 19 11 3
++ * 56 57 58 59 60 61 62 63 57 49 41 33 25 17 9 1
++ *
++ * The output has been subject to swaps of the form
++ * 0 1 -> 3 1 but the odd and even bits have been put into
++ * 2 3 2 0
++ * different words. The main trick is to remember that
++ * t=((l>>size)^r)&(mask);
++ * r^=t;
++ * l^=(t<<size);
++ * can be used to swap and move bits between words.
++ *
++ * So l = 0 1 2 3 r = 16 17 18 19
++ * 4 5 6 7 20 21 22 23
++ * 8 9 10 11 24 25 26 27
++ * 12 13 14 15 28 29 30 31
++ * becomes (for size == 2 and mask == 0x3333)
++ * t = 2^16 3^17 -- -- l = 0 1 16 17 r = 2 3 18 19
++ * 6^20 7^21 -- -- 4 5 20 21 6 7 22 23
++ * 10^24 11^25 -- -- 8 9 24 25 10 11 24 25
++ * 14^28 15^29 -- -- 12 13 28 29 14 15 28 29
++ *
++ * Thanks for hints from Richard Outerbridge - he told me IP&FP
++ * could be done in 15 xor, 10 shifts and 5 ands.
++ * When I finally started to think of the problem in 2D
++ * I first got ~42 operations without xors. When I remembered
++ * how to use xors :-) I got it to its final state.
++ */
++
++#define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
++ (b)^=(t),\
++ (a)^=((t)<<(n)))
++
++#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
++ (a)=(a)^(t)^(t>>(16-(n))))
++
++
++#define D_ENCRYPT(L,R,S) \
++ u=(R^s[S ]); \
++ t=R^s[S+1]; \
++ t=((t>>4)+(t<<28)); \
++ L^= des_SPtrans[1][(t )&0x3f]| \
++ des_SPtrans[3][(t>> 8)&0x3f]| \
++ des_SPtrans[5][(t>>16)&0x3f]| \
++ des_SPtrans[7][(t>>24)&0x3f]| \
++ des_SPtrans[0][(u )&0x3f]| \
++ des_SPtrans[2][(u>> 8)&0x3f]| \
++ des_SPtrans[4][(u>>16)&0x3f]| \
++ des_SPtrans[6][(u>>24)&0x3f];
++
++#define ITERATIONS 16
++
++static const char shifts2[16] =
++{0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0};
++
++static void des_set_key (unsigned char *, unsigned long *);
++static void des_encrypt (unsigned long *, unsigned long *, int);
++int _des_crypt (char *, unsigned, struct desparams *);
++
++static void
++des_set_key (unsigned char *key, unsigned long *schedule)
++{
++ register unsigned long c, d, t, s;
++ register unsigned char *in;
++ register unsigned long *k;
++ register int i;
++
++ k = (unsigned long *) schedule;
++ in = key;
++
++ c2l (in, c);
++ c2l (in, d);
++
++ /* I now do it in 47 simple operations :-)
++ * Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov)
++ * for the inspiration. :-) */
++ PERM_OP (d, c, t, 4, 0x0f0f0f0f);
++ HPERM_OP (c, t, -2, 0xcccc0000);
++ HPERM_OP (d, t, -2, 0xcccc0000);
++ PERM_OP (d, c, t, 1, 0x55555555);
++ PERM_OP (c, d, t, 8, 0x00ff00ff);
++ PERM_OP (d, c, t, 1, 0x55555555);
++ d = (((d & 0x000000ff) << 16) | (d & 0x0000ff00) |
++ ((d & 0x00ff0000) >> 16) | ((c & 0xf0000000) >> 4));
++ c &= 0x0fffffff;
++
++ for (i = 0; i < ITERATIONS; i++)
++ {
++ if (shifts2[i])
++ {
++ c = ((c >> 2) | (c << 26));
++ d = ((d >> 2) | (d << 26));
++ }
++ else
++ {
++ c = ((c >> 1) | (c << 27));
++ d = ((d >> 1) | (d << 27));
++ }
++ c &= 0x0fffffff;
++ d &= 0x0fffffff;
++ /* could be a few less shifts but I am to lazy at this
++ * point in time to investigate */
++ s = des_skb[0][(c) & 0x3f] |
++ des_skb[1][((c >> 6) & 0x03) | ((c >> 7) & 0x3c)] |
++ des_skb[2][((c >> 13) & 0x0f) | ((c >> 14) & 0x30)] |
++ des_skb[3][((c >> 20) & 0x01) | ((c >> 21) & 0x06) | ((c >> 22) & 0x38)];
++ t = des_skb[4][(d) & 0x3f] |
++ des_skb[5][((d >> 7) & 0x03) | ((d >> 8) & 0x3c)] |
++ des_skb[6][(d >> 15) & 0x3f] |
++ des_skb[7][((d >> 21) & 0x0f) | ((d >> 22) & 0x30)];
++
++ /* table contained 0213 4657 */
++ *(k++) = ((t << 16) | (s & 0x0000ffff)) & 0xffffffff;
++ s = ((s >> 16) | (t & 0xffff0000));
++
++ s = (s << 4) | (s >> 28);
++ *(k++) = s & 0xffffffff;
++ }
++}
++
++
++static void
++des_encrypt (unsigned long *buf, unsigned long *schedule, int encrypt)
++{
++ register unsigned long l, r, t, u;
++ register int i;
++ register unsigned long *s;
++
++ l = buf[0];
++ r = buf[1];
++
++ /* do IP */
++ PERM_OP (r, l, t, 4, 0x0f0f0f0f);
++ PERM_OP (l, r, t, 16, 0x0000ffff);
++ PERM_OP (r, l, t, 2, 0x33333333);
++ PERM_OP (l, r, t, 8, 0x00ff00ff);
++ PERM_OP (r, l, t, 1, 0x55555555);
++ /* r and l are reversed - remember that :-) - fix
++ * it in the next step */
++
++ /* Things have been modified so that the initial rotate is
++ * done outside the loop. This required the
++ * des_SPtrans values in sp.h to be rotated 1 bit to the right.
++ * One perl script later and things have a 5% speed up on a sparc2.
++ * Thanks to Richard Outerbridge <71755.204@CompuServe.COM>
++ * for pointing this out. */
++ t = (r << 1) | (r >> 31);
++ r = (l << 1) | (l >> 31);
++ l = t;
++
++ /* clear the top bits on machines with 8byte longs */
++ l &= 0xffffffff;
++ r &= 0xffffffff;
++
++ s = (unsigned long *) schedule;
++ /* I don't know if it is worth the effort of loop unrolling the
++ * inner loop */
++ if (encrypt)
++ {
++ for (i = 0; i < 32; i += 4)
++ {
++ D_ENCRYPT (l, r, i + 0); /* 1 */
++ D_ENCRYPT (r, l, i + 2); /* 2 */
++ }
++ }
++ else
++ {
++ for (i = 30; i > 0; i -= 4)
++ {
++ D_ENCRYPT (l, r, i - 0); /* 16 */
++ D_ENCRYPT (r, l, i - 2); /* 15 */
++ }
++ }
++ l = (l >> 1) | (l << 31);
++ r = (r >> 1) | (r << 31);
++ /* clear the top bits on machines with 8byte longs */
++ l &= 0xffffffff;
++ r &= 0xffffffff;
++
++ /* swap l and r
++ * we will not do the swap so just remember they are
++ * reversed for the rest of the subroutine
++ * luckily FP fixes this problem :-) */
++
++ PERM_OP (r, l, t, 1, 0x55555555);
++ PERM_OP (l, r, t, 8, 0x00ff00ff);
++ PERM_OP (r, l, t, 2, 0x33333333);
++ PERM_OP (l, r, t, 16, 0x0000ffff);
++ PERM_OP (r, l, t, 4, 0x0f0f0f0f);
++
++ buf[0] = l;
++ buf[1] = r;
++
++ l = r = t = u = 0;
++}
++
++
++int
++_des_crypt (char *buf, unsigned len, struct desparams *desp)
++{
++ unsigned long schedule[32];
++ register unsigned long tin0, tin1;
++ register unsigned long tout0, tout1, xor0, xor1;
++ register unsigned char *in, *out;
++ unsigned long tbuf[2];
++ unsigned char *iv, *oiv;
++ int cbc_mode;
++
++ cbc_mode = (desp->des_mode == CBC) ? 1 : 0;
++
++ in = (unsigned char *) buf;
++ out = (unsigned char *) buf;
++ oiv = iv = (unsigned char *) desp->des_ivec;
++
++ des_set_key (desp->des_key, schedule);
++
++ tin0 = tin1 = 0; /* For GCC */
++ if (desp->des_dir == ENCRYPT)
++ {
++ c2l (iv, tout0);
++ c2l (iv, tout1);
++ for (; len > 0; len -= 8)
++ {
++ c2l (in, tin0);
++ c2l (in, tin1);
++ if (cbc_mode)
++ {
++ tin0 ^= tout0;
++ tin1 ^= tout1;
++ }
++ tbuf[0] = tin0;
++ tbuf[1] = tin1;
++ des_encrypt (tbuf, schedule, 1);
++ tout0 = tbuf[0];
++ tout1 = tbuf[1];
++ l2c (tout0, out);
++ l2c (tout1, out);
++ }
++ l2c (tout0, oiv);
++ l2c (tout1, oiv);
++ }
++ else
++ {
++ c2l (iv, xor0);
++ c2l (iv, xor1);
++ for (; len > 0; len -= 8)
++ {
++ c2l (in, tin0);
++ c2l (in, tin1);
++ tbuf[0] = tin0;
++ tbuf[1] = tin1;
++ des_encrypt (tbuf, schedule, 0);
++ if (cbc_mode)
++ {
++ tout0 = tbuf[0] ^ xor0;
++ tout1 = tbuf[1] ^ xor1;
++ xor0 = tin0;
++ xor1 = tin1;
++ }
++ else
++ {
++ tout0 = tbuf[0];
++ tout1 = tbuf[1];
++ }
++ l2c (tout0, out);
++ l2c (tout1, out);
++ }
++ l2c (tin0, oiv);
++ l2c (tin1, oiv);
++ }
++ tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
++ tbuf[0] = tbuf[1] = 0;
++ __bzero (schedule, sizeof (schedule));
++
++ return (1);
++}
+diff -urN libtirpc-0.2.3/src/key_call.c libtirpc-0.2.3.new/src/key_call.c
+--- libtirpc-0.2.3/src/key_call.c 2013-02-13 16:13:59.000000000 +0100
++++ libtirpc-0.2.3.new/src/key_call.c 2013-03-19 12:24:24.368923058 +0100
+@@ -1,452 +1,551 @@
+ /*
+- * Copyright (c) 2009, Sun Microsystems, Inc.
+- * All rights reserved.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions are met:
+- * - Redistributions of source code must retain the above copyright notice,
+- * this list of conditions and the following disclaimer.
+- * - 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.
+- * - Neither the name of Sun Microsystems, Inc. nor the names of its
+- * contributors may be used to endorse or promote products derived
+- * from this software without specific prior written permission.
++ * modification, are permitted provided that the following conditions are
++ * met:
+ *
+- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
++ * * Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * * 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.
++ * * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
++ * COPYRIGHT HOLDER 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.
+ */
+ /*
+- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
++ * The original source is from the RPCSRC 4.0 package from Sun Microsystems.
++ * The Interface to keyserver protocoll 2, RPC over AF_UNIX and Linux/doors
++ * was added by Thorsten Kukuk <kukuk@suse.de>
++ * Since the Linux/doors project was stopped, I doubt that this code will
++ * ever be useful <kukuk@suse.de>.
+ */
+
+-
+-#include <sys/cdefs.h>
+-
+-/*
+- * key_call.c, Interface to keyserver
+- *
+- * setsecretkey(key) - set your secret key
+- * encryptsessionkey(agent, deskey) - encrypt a session key to talk to agent
+- * decryptsessionkey(agent, deskey) - decrypt ditto
+- * gendeskey(deskey) - generate a secure des key
+- */
+-
+-#include <pthread.h>
+-#include <reentrant.h>
+ #include <stdio.h>
+-#include <stdlib.h>
+-#include <unistd.h>
+ #include <errno.h>
++#include <fcntl.h>
++#include <signal.h>
++#include <unistd.h>
++#include <string.h>
+ #include <rpc/rpc.h>
+ #include <rpc/auth.h>
+-#include <rpc/auth_unix.h>
+-#include <rpc/key_prot.h>
+-#include <string.h>
+-#include <netconfig.h>
+-#include <sys/utsname.h>
+-#include <stdlib.h>
+-#include <signal.h>
+ #include <sys/wait.h>
+-#include <sys/fcntl.h>
++#include <sys/param.h>
++#include <sys/socket.h>
++#include <rpc/key_prot.h>
++#include <bits/libc-lock.h>
+
++#define KEY_TIMEOUT 5 /* per-try timeout in seconds */
++#define KEY_NRETRY 12 /* number of retries */
+
+-#define KEY_TIMEOUT 5 /* per-try timeout in seconds */
+-#define KEY_NRETRY 12 /* number of retries */
++#define debug(msg) /* turn off debugging */
+
+-#ifdef DEBUG
+-#define debug(msg) (void) fprintf(stderr, "%s\n", msg);
+-#else
+-#define debug(msg)
+-#endif /* DEBUG */
++#ifndef SO_PASSCRED
++extern int _openchild (const char *command, FILE **fto, FILE **ffrom);
++#endif
+
+-/*
+- * Hack to allow the keyserver to use AUTH_DES (for authenticated
+- * NIS+ calls, for example). The only functions that get called
+- * are key_encryptsession_pk, key_decryptsession_pk, and key_gendes.
+- *
+- * The approach is to have the keyserver fill in pointers to local
+- * implementations of these functions, and to call those in key_call().
+- */
++static int key_call (u_long, xdrproc_t xdr_arg, char *,
++ xdrproc_t xdr_rslt, char *);
+
+-cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0;
+-cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0;
+-des_block *(*__key_gendes_LOCAL)() = 0;
+-
+-static int key_call( u_long, xdrproc_t, void *, xdrproc_t, void *);
++static const struct timeval trytimeout = {KEY_TIMEOUT, 0};
++static const struct timeval tottimeout = {KEY_TIMEOUT *KEY_NRETRY, 0};
+
+ int
+-key_setsecret(secretkey)
+- const char *secretkey;
++key_setsecret (const char *secretkey)
+ {
+- keystatus status;
++ keystatus status;
+
+- if (!key_call((u_long) KEY_SET, (xdrproc_t)xdr_keybuf,
+- (void *)secretkey,
+- (xdrproc_t)xdr_keystatus, &status)) {
+- return (-1);
+- }
+- if (status != KEY_SUCCESS) {
+- debug("set status is nonzero");
+- return (-1);
+- }
+- return (0);
++ if (!key_call ((u_long) KEY_SET, (xdrproc_t) xdr_keybuf, secretkey,
++ (xdrproc_t) xdr_keystatus, (char *) &status))
++ return -1;
++ if (status != KEY_SUCCESS)
++ {
++ debug ("set status is nonzero");
++ return -1;
++ }
++ return 0;
+ }
+
+-
+ /* key_secretkey_is_set() returns 1 if the keyserver has a secret key
+ * stored for the caller's effective uid; it returns 0 otherwise
+ *
+ * N.B.: The KEY_NET_GET key call is undocumented. Applications shouldn't
+ * be using it, because it allows them to get the user's secret key.
+ */
+-
+ int
+-key_secretkey_is_set(void)
++key_secretkey_is_set (void)
+ {
+- struct key_netstres kres;
++ struct key_netstres kres;
+
+- memset((void*)&kres, 0, sizeof (kres));
+- if (key_call((u_long) KEY_NET_GET, (xdrproc_t)xdr_void, NULL,
+- (xdrproc_t)xdr_key_netstres, &kres) &&
+- (kres.status == KEY_SUCCESS) &&
+- (kres.key_netstres_u.knet.st_priv_key[0] != 0)) {
+- /* avoid leaving secret key in memory */
+- memset(kres.key_netstres_u.knet.st_priv_key, 0, HEXKEYBYTES);
+- return (1);
+- }
+- return (0);
++ memset (&kres, 0, sizeof (kres));
++ if (key_call ((u_long) KEY_NET_GET, (xdrproc_t) xdr_void,
++ (char *) NULL, (xdrproc_t) xdr_key_netstres,
++ (char *) &kres) &&
++ (kres.status == KEY_SUCCESS) &&
++ (kres.key_netstres_u.knet.st_priv_key[0] != 0))
++ {
++ /* avoid leaving secret key in memory */
++ memset (kres.key_netstres_u.knet.st_priv_key, 0, HEXKEYBYTES);
++ return 1;
++ }
++ return 0;
+ }
+
+ int
+-key_encryptsession_pk(remotename, remotekey, deskey)
+- char *remotename;
+- netobj *remotekey;
+- des_block *deskey;
+-{
+- cryptkeyarg2 arg;
+- cryptkeyres res;
+-
+- arg.remotename = remotename;
+- arg.remotekey = *remotekey;
+- arg.deskey = *deskey;
+- if (!key_call((u_long)KEY_ENCRYPT_PK, (xdrproc_t)xdr_cryptkeyarg2, &arg,
+- (xdrproc_t)xdr_cryptkeyres, &res)) {
+- return (-1);
+- }
+- if (res.status != KEY_SUCCESS) {
+- debug("encrypt status is nonzero");
+- return (-1);
+- }
+- *deskey = res.cryptkeyres_u.deskey;
+- return (0);
+-}
++key_encryptsession (const char *remotename, des_block *deskey)
++{
++ cryptkeyarg arg;
++ cryptkeyres res;
+
+-int
+-key_decryptsession_pk(remotename, remotekey, deskey)
+- char *remotename;
+- netobj *remotekey;
+- des_block *deskey;
+-{
+- cryptkeyarg2 arg;
+- cryptkeyres res;
+-
+- arg.remotename = remotename;
+- arg.remotekey = *remotekey;
+- arg.deskey = *deskey;
+- if (!key_call((u_long)KEY_DECRYPT_PK, (xdrproc_t)xdr_cryptkeyarg2, &arg,
+- (xdrproc_t)xdr_cryptkeyres, &res)) {
+- return (-1);
+- }
+- if (res.status != KEY_SUCCESS) {
+- debug("decrypt status is nonzero");
+- return (-1);
+- }
+- *deskey = res.cryptkeyres_u.deskey;
+- return (0);
++ arg.remotename = remotename;
++ arg.deskey = *deskey;
++ if (!key_call ((u_long) KEY_ENCRYPT, (xdrproc_t) xdr_cryptkeyarg,
++ (char *) &arg, (xdrproc_t) xdr_cryptkeyres,
++ (char *) &res))
++ return -1;
++
++ if (res.status != KEY_SUCCESS)
++ {
++ debug ("encrypt status is nonzero");
++ return -1;
++ }
++ *deskey = res.cryptkeyres_u.deskey;
++ return 0;
+ }
+
+ int
+-key_encryptsession(remotename, deskey)
+- const char *remotename;
+- des_block *deskey;
+-{
+- cryptkeyarg arg;
+- cryptkeyres res;
+-
+- arg.remotename = (char *) remotename;
+- arg.deskey = *deskey;
+- if (!key_call((u_long)KEY_ENCRYPT, (xdrproc_t)xdr_cryptkeyarg, &arg,
+- (xdrproc_t)xdr_cryptkeyres, &res)) {
+- return (-1);
+- }
+- if (res.status != KEY_SUCCESS) {
+- debug("encrypt status is nonzero");
+- return (-1);
+- }
+- *deskey = res.cryptkeyres_u.deskey;
+- return (0);
++key_decryptsession (const char *remotename, des_block *deskey)
++{
++ cryptkeyarg arg;
++ cryptkeyres res;
++
++ arg.remotename = remotename;
++ arg.deskey = *deskey;
++ if (!key_call ((u_long) KEY_DECRYPT, (xdrproc_t) xdr_cryptkeyarg,
++ (char *) &arg, (xdrproc_t) xdr_cryptkeyres,
++ (char *) &res))
++ return -1;
++ if (res.status != KEY_SUCCESS)
++ {
++ debug ("decrypt status is nonzero");
++ return -1;
++ }
++ *deskey = res.cryptkeyres_u.deskey;
++ return 0;
+ }
+
+ int
+-key_decryptsession(remotename, deskey)
+- const char *remotename;
+- des_block *deskey;
+-{
+- cryptkeyarg arg;
+- cryptkeyres res;
+-
+- arg.remotename = (char *) remotename;
+- arg.deskey = *deskey;
+- if (!key_call((u_long)KEY_DECRYPT, (xdrproc_t)xdr_cryptkeyarg, &arg,
+- (xdrproc_t)xdr_cryptkeyres, &res)) {
+- return (-1);
+- }
+- if (res.status != KEY_SUCCESS) {
+- debug("decrypt status is nonzero");
+- return (-1);
+- }
+- *deskey = res.cryptkeyres_u.deskey;
+- return (0);
++key_encryptsession_pk (char *remotename, netobj *remotekey,
++ des_block *deskey)
++{
++ cryptkeyarg2 arg;
++ cryptkeyres res;
++
++ arg.remotename = remotename;
++ arg.remotekey = *remotekey;
++ arg.deskey = *deskey;
++ if (!key_call ((u_long) KEY_ENCRYPT_PK, (xdrproc_t) xdr_cryptkeyarg2,
++ (char *) &arg, (xdrproc_t) xdr_cryptkeyres,
++ (char *) &res))
++ return -1;
++
++ if (res.status != KEY_SUCCESS)
++ {
++ debug ("encrypt status is nonzero");
++ return -1;
++ }
++ *deskey = res.cryptkeyres_u.deskey;
++ return 0;
+ }
+
+ int
+-key_gendes(key)
+- des_block *key;
++key_decryptsession_pk (char *remotename, netobj *remotekey,
++ des_block *deskey)
+ {
+- if (!key_call((u_long)KEY_GEN, (xdrproc_t)xdr_void, NULL,
+- (xdrproc_t)xdr_des_block, key)) {
+- return (-1);
+- }
+- return (0);
++ cryptkeyarg2 arg;
++ cryptkeyres res;
++
++ arg.remotename = remotename;
++ arg.remotekey = *remotekey;
++ arg.deskey = *deskey;
++ if (!key_call ((u_long) KEY_DECRYPT_PK, (xdrproc_t) xdr_cryptkeyarg2,
++ (char *) &arg, (xdrproc_t) xdr_cryptkeyres,
++ (char *) &res))
++ return -1;
++
++ if (res.status != KEY_SUCCESS)
++ {
++ debug ("decrypt status is nonzero");
++ return -1;
++ }
++ *deskey = res.cryptkeyres_u.deskey;
++ return 0;
+ }
+
+ int
+-key_setnet(arg)
+-struct key_netstarg *arg;
++key_gendes (des_block *key)
+ {
+- keystatus status;
++ struct sockaddr_in sin;
++ CLIENT *client;
++ int socket;
++ enum clnt_stat stat;
++
++ sin.sin_family = AF_INET;
++ sin.sin_port = 0;
++ sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
++ __bzero (sin.sin_zero, sizeof (sin.sin_zero));
++ socket = RPC_ANYSOCK;
++ client = clntudp_bufcreate (&sin, (u_long) KEY_PROG, (u_long) KEY_VERS,
++ trytimeout, &socket, RPCSMALLMSGSIZE,
++ RPCSMALLMSGSIZE);
++ if (client == NULL)
++ return -1;
++
++ stat = clnt_call (client, KEY_GEN, (xdrproc_t) xdr_void, NULL,
++ (xdrproc_t) xdr_des_block, (caddr_t) key,
++ tottimeout);
++ clnt_destroy (client);
++ close (socket);
++ if (stat != RPC_SUCCESS)
++ return -1;
+
++ return 0;
++}
+
+- if (!key_call((u_long) KEY_NET_PUT, (xdrproc_t)xdr_key_netstarg, arg,
+- (xdrproc_t)xdr_keystatus, &status)){
+- return (-1);
+- }
++int
++key_setnet (struct key_netstarg *arg)
++{
++ keystatus status;
+
+- if (status != KEY_SUCCESS) {
+- debug("key_setnet status is nonzero");
+- return (-1);
+- }
+- return (1);
++ if (!key_call ((u_long) KEY_NET_PUT, (xdrproc_t) xdr_key_netstarg,
++ (char *) arg,(xdrproc_t) xdr_keystatus,
++ (char *) &status))
++ return -1;
++
++ if (status != KEY_SUCCESS)
++ {
++ debug ("key_setnet status is nonzero");
++ return -1;
++ }
++ return 1;
+ }
+
+-
+ int
+-key_get_conv(pkey, deskey)
+- char *pkey;
+- des_block *deskey;
+-{
+- cryptkeyres res;
+-
+- if (!key_call((u_long) KEY_GET_CONV, (xdrproc_t)xdr_keybuf, pkey,
+- (xdrproc_t)xdr_cryptkeyres, &res)) {
+- return (-1);
+- }
+- if (res.status != KEY_SUCCESS) {
+- debug("get_conv status is nonzero");
+- return (-1);
+- }
+- *deskey = res.cryptkeyres_u.deskey;
+- return (0);
++key_get_conv (char *pkey, des_block *deskey)
++{
++ cryptkeyres res;
++
++ if (!key_call ((u_long) KEY_GET_CONV, (xdrproc_t) xdr_keybuf, pkey,
++ (xdrproc_t) xdr_cryptkeyres, (char *) &res))
++ return -1;
++
++ if (res.status != KEY_SUCCESS)
++ {
++ debug ("get_conv status is nonzero");
++ return -1;
++ }
++ *deskey = res.cryptkeyres_u.deskey;
++ return 0;
+ }
+
+-struct key_call_private {
+- CLIENT *client; /* Client handle */
+- pid_t pid; /* process-id at moment of creation */
+- uid_t uid; /* user-id at last authorization */
+-};
+-static struct key_call_private *key_call_private_main = NULL;
++/*
++ * Hack to allow the keyserver to use AUTH_DES (for authenticated
++ * NIS+ calls, for example). The only functions that get called
++ * are key_encryptsession_pk, key_decryptsession_pk, and key_gendes.
++ *
++ * The approach is to have the keyserver fill in pointers to local
++ * implementations of these functions, and to call those in key_call().
++ */
++
++cryptkeyres *(*__key_encryptsession_pk_LOCAL) (uid_t, char *);
++cryptkeyres *(*__key_decryptsession_pk_LOCAL) (uid_t, char *);
++des_block *(*__key_gendes_LOCAL) (uid_t, char *);
+
+-static void
+-key_call_destroy(void *vp)
++#ifndef SO_PASSCRED
++static int
++key_call_keyenvoy (u_long proc, xdrproc_t xdr_arg, char *arg,
++ xdrproc_t xdr_rslt, char *rslt)
+ {
+- struct key_call_private *kcp = (struct key_call_private *)vp;
++ XDR xdrargs;
++ XDR xdrrslt;
++ FILE *fargs;
++ FILE *frslt;
++ sigset_t oldmask, mask;
++ union wait status;
++ int pid;
++ int success;
++ uid_t ruid;
++ uid_t euid;
++ static const char MESSENGER[] = "/usr/etc/keyenvoy";
++
++ success = 1;
++ sigemptyset (&mask);
++ sigaddset (&mask, SIGCHLD);
++ __sigprocmask (SIG_BLOCK, &mask, &oldmask);
++
++ /*
++ * We are going to exec a set-uid program which makes our effective uid
++ * zero, and authenticates us with our real uid. We need to make the
++ * effective uid be the real uid for the setuid program, and
++ * the real uid be the effective uid so that we can change things back.
++ */
++ euid = geteuid ();
++ ruid = getuid ();
++ __setreuid (euid, ruid);
++ pid = _openchild (MESSENGER, &fargs, &frslt);
++ __setreuid (ruid, euid);
++ if (pid < 0)
++ {
++ debug ("open_streams");
++ __sigprocmask (SIG_SETMASK, &oldmask, NULL);
++ return (0);
++ }
++ xdrstdio_create (&xdrargs, fargs, XDR_ENCODE);
++ xdrstdio_create (&xdrrslt, frslt, XDR_DECODE);
++
++ if (!xdr_u_long (&xdrargs, &proc) || !(*xdr_arg) (&xdrargs, arg))
++ {
++ debug ("xdr args");
++ success = 0;
++ }
++ fclose (fargs);
++
++ if (success && !(*xdr_rslt) (&xdrrslt, rslt))
++ {
++ debug ("xdr rslt");
++ success = 0;
++ }
++ fclose(frslt);
++
++ wait_again:
++ if (__wait4 (pid, &status, 0, NULL) < 0)
++ {
++ if (errno == EINTR)
++ goto wait_again;
++ debug ("wait4");
++ if (errno == ECHILD || errno == ESRCH)
++ perror ("wait");
++ else
++ success = 0;
++ }
++ else
++ if (status.w_retcode)
++ {
++ debug ("wait4 1");
++ success = 0;
++ }
++ __sigprocmask (SIG_SETMASK, &oldmask, NULL);
+
+- if (kcp) {
+- if (kcp->client)
+- clnt_destroy(kcp->client);
+- free(kcp);
+- }
++ return success;
+ }
++#endif
++
++struct key_call_private {
++ CLIENT *client; /* Client handle */
++ pid_t pid; /* process-id at moment of creation */
++ uid_t uid; /* user-id at last authorization */
++};
++#ifdef _RPC_THREAD_SAFE_
++#define key_call_private_main RPC_THREAD_VARIABLE(key_call_private_s)
++#else
++static struct key_call_private *key_call_private_main;
++#endif
+
+ /*
+ * Keep the handle cached. This call may be made quite often.
+ */
+ static CLIENT *
+-getkeyserv_handle(vers)
+-int vers;
++getkeyserv_handle (int vers)
+ {
+- void *localhandle;
+- struct netconfig *nconf;
+- struct netconfig *tpconf;
+- struct key_call_private *kcp = key_call_private_main;
+- struct timeval wait_time;
+- struct utsname u;
+- int fd;
+- extern thread_key_t key_call_key;
+- extern mutex_t tsd_lock;
+-
+-#define TOTAL_TIMEOUT 30 /* total timeout talking to keyserver */
+-#define TOTAL_TRIES 5 /* Number of tries */
+-
+- if (key_call_key == -1) {
+- mutex_lock(&tsd_lock);
+- if (key_call_key == -1)
+- thr_keycreate(&key_call_key, key_call_destroy);
+- mutex_unlock(&tsd_lock);
+- }
+- kcp = (struct key_call_private *)thr_getspecific(key_call_key);
+- if (kcp == (struct key_call_private *)NULL) {
+- kcp = (struct key_call_private *)malloc(sizeof (*kcp));
+- if (kcp == (struct key_call_private *)NULL) {
+- return ((CLIENT *) NULL);
+- }
+- thr_setspecific(key_call_key, (void *) kcp);
+- kcp->client = NULL;
+- }
++ struct key_call_private *kcp = key_call_private_main;
++ struct timeval wait_time;
++ int fd;
++ struct sockaddr_un name;
++ socklen_t namelen = sizeof(struct sockaddr_un);
++
++#define TOTAL_TIMEOUT 30 /* total timeout talking to keyserver */
++#define TOTAL_TRIES 5 /* Number of tries */
++
++ if (kcp == (struct key_call_private *)NULL)
++ {
++ kcp = (struct key_call_private *)malloc (sizeof (*kcp));
++ if (kcp == (struct key_call_private *)NULL)
++ return (CLIENT *) NULL;
++
++ key_call_private_main = kcp;
++ kcp->client = NULL;
++ }
++
++ /* if pid has changed, destroy client and rebuild */
++ if (kcp->client != NULL && kcp->pid != getpid ())
++ {
++ auth_destroy (kcp->client->cl_auth);
++ clnt_destroy (kcp->client);
++ kcp->client = NULL;
++ }
++
++ if (kcp->client != NULL)
++ {
++ /* if other side closed socket, build handle again */
++ clnt_control (kcp->client, CLGET_FD, (char *)&fd);
++ if (getpeername (fd,(struct sockaddr *)&name,&namelen) == -1)
++ {
++ auth_destroy (kcp->client->cl_auth);
++ clnt_destroy (kcp->client);
++ kcp->client = NULL;
++ }
++ }
++
++ if (kcp->client != NULL)
++ {
++ /* if uid has changed, build client handle again */
++ if (kcp->uid != geteuid ())
++ {
++ kcp->uid = geteuid ();
++ auth_destroy (kcp->client->cl_auth);
++ kcp->client->cl_auth =
++ authunix_create ((char *)"", kcp->uid, 0, 0, NULL);
++ if (kcp->client->cl_auth == NULL)
++ {
++ clnt_destroy (kcp->client);
++ kcp->client = NULL;
++ return ((CLIENT *) NULL);
++ }
++ }
++ /* Change the version number to the new one */
++ clnt_control (kcp->client, CLSET_VERS, (void *)&vers);
++ return kcp->client;
++ }
++
++ if ((kcp->client == (CLIENT *) NULL))
++ /* Use the AF_UNIX transport */
++ kcp->client = clnt_create ("/var/run/keyservsock", KEY_PROG, vers, "unix");
++
++ if (kcp->client == (CLIENT *) NULL)
++ return (CLIENT *) NULL;
++
++ kcp->uid = geteuid ();
++ kcp->pid = getpid ();
++ kcp->client->cl_auth = authunix_create ((char *)"", kcp->uid, 0, 0, NULL);
++ if (kcp->client->cl_auth == NULL)
++ {
++ clnt_destroy (kcp->client);
++ kcp->client = NULL;
++ return (CLIENT *) NULL;
++ }
++
++ wait_time.tv_sec = TOTAL_TIMEOUT/TOTAL_TRIES;
++ wait_time.tv_usec = 0;
++ clnt_control (kcp->client, CLSET_RETRY_TIMEOUT,
++ (char *)&wait_time);
++ if (clnt_control (kcp->client, CLGET_FD, (char *)&fd))
++ fcntl (fd, F_SETFD, FD_CLOEXEC); /* make it "close on exec" */
+
+- /* if pid has changed, destroy client and rebuild */
+- if (kcp->client != NULL && kcp->pid != getpid()) {
+- clnt_destroy(kcp->client);
+- kcp->client = NULL;
+- }
++ return kcp->client;
++}
+
+- if (kcp->client != NULL) {
+- /* if uid has changed, build client handle again */
+- if (kcp->uid != geteuid()) {
+- kcp->uid = geteuid();
+- auth_destroy(kcp->client->cl_auth);
+- kcp->client->cl_auth =
+- authsys_create("", kcp->uid, 0, 0, NULL);
+- if (kcp->client->cl_auth == NULL) {
+- clnt_destroy(kcp->client);
+- kcp->client = NULL;
+- return ((CLIENT *) NULL);
+- }
+- }
+- /* Change the version number to the new one */
+- clnt_control(kcp->client, CLSET_VERS, (void *)&vers);
+- return (kcp->client);
+- }
+- if (!(localhandle = setnetconfig())) {
+- return ((CLIENT *) NULL);
+- }
+- tpconf = NULL;
+- if (uname(&u) == -1) {
+- endnetconfig(localhandle);
+- return ((CLIENT *) NULL);
+- }
+- while ((nconf = getnetconfig(localhandle)) != NULL) {
+- if (strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0) {
+- /*
+- * We use COTS_ORD here so that the caller can
+- * find out immediately if the server is dead.
+- */
+- if (nconf->nc_semantics == NC_TPI_COTS_ORD) {
+- kcp->client = clnt_tp_create(u.nodename,
+- KEY_PROG, vers, nconf);
+- if (kcp->client)
+- break;
+- } else {
+- tpconf = nconf;
+- }
+- }
+- }
+- if ((kcp->client == (CLIENT *) NULL) && (tpconf))
+- /* Now, try the CLTS or COTS loopback transport */
+- kcp->client = clnt_tp_create(u.nodename,
+- KEY_PROG, vers, tpconf);
+- endnetconfig(localhandle);
+-
+- if (kcp->client == (CLIENT *) NULL) {
+- return ((CLIENT *) NULL);
+- }
+- kcp->uid = geteuid();
+- kcp->pid = getpid();
+- kcp->client->cl_auth = authsys_create("", kcp->uid, 0, 0, NULL);
+- if (kcp->client->cl_auth == NULL) {
+- clnt_destroy(kcp->client);
+- kcp->client = NULL;
+- return ((CLIENT *) NULL);
+- }
++/* returns 0 on failure, 1 on success */
++static int
++key_call_socket (u_long proc, xdrproc_t xdr_arg, char *arg,
++ xdrproc_t xdr_rslt, char *rslt)
++{
++ CLIENT *clnt;
++ struct timeval wait_time;
++ int result = 0;
+
+- wait_time.tv_sec = TOTAL_TIMEOUT/TOTAL_TRIES;
+- wait_time.tv_usec = 0;
+- (void) clnt_control(kcp->client, CLSET_RETRY_TIMEOUT,
+- (char *)&wait_time);
+- if (clnt_control(kcp->client, CLGET_FD, (char *)&fd))
+- fcntl(fd, F_SETFD, 1); /* make it "close on exec" */
++ if ((proc == KEY_ENCRYPT_PK) || (proc == KEY_DECRYPT_PK) ||
++ (proc == KEY_NET_GET) || (proc == KEY_NET_PUT) ||
++ (proc == KEY_GET_CONV))
++ clnt = getkeyserv_handle(2); /* talk to version 2 */
++ else
++ clnt = getkeyserv_handle(1); /* talk to version 1 */
+
+- return (kcp->client);
++ if (clnt != NULL)
++ {
++ wait_time.tv_sec = TOTAL_TIMEOUT;
++ wait_time.tv_usec = 0;
++
++ if (clnt_call (clnt, proc, xdr_arg, arg, xdr_rslt, rslt,
++ wait_time) == RPC_SUCCESS)
++ result = 1;
++ }
++
++ return result;
+ }
+
+-/* returns 0 on failure, 1 on success */
+
++/* returns 0 on failure, 1 on success */
+ static int
+-key_call(proc, xdr_arg, arg, xdr_rslt, rslt)
+- u_long proc;
+- xdrproc_t xdr_arg;
+- void *arg;
+- xdrproc_t xdr_rslt;
+- void *rslt;
+-{
+- CLIENT *clnt;
+- struct timeval wait_time;
+-
+- if (proc == KEY_ENCRYPT_PK && __key_encryptsession_pk_LOCAL) {
+- cryptkeyres *res;
+- res = (*__key_encryptsession_pk_LOCAL)(geteuid(), arg);
+- *(cryptkeyres*)rslt = *res;
+- return (1);
+- } else if (proc == KEY_DECRYPT_PK && __key_decryptsession_pk_LOCAL) {
+- cryptkeyres *res;
+- res = (*__key_decryptsession_pk_LOCAL)(geteuid(), arg);
+- *(cryptkeyres*)rslt = *res;
+- return (1);
+- } else if (proc == KEY_GEN && __key_gendes_LOCAL) {
+- des_block *res;
+- res = (*__key_gendes_LOCAL)(geteuid(), 0);
+- *(des_block*)rslt = *res;
+- return (1);
+- }
+-
+- if ((proc == KEY_ENCRYPT_PK) || (proc == KEY_DECRYPT_PK) ||
+- (proc == KEY_NET_GET) || (proc == KEY_NET_PUT) ||
+- (proc == KEY_GET_CONV))
+- clnt = getkeyserv_handle(2); /* talk to version 2 */
+- else
+- clnt = getkeyserv_handle(1); /* talk to version 1 */
++key_call (u_long proc, xdrproc_t xdr_arg, char *arg,
++ xdrproc_t xdr_rslt, char *rslt)
++{
++#ifndef SO_PASSCRED
++ static int use_keyenvoy;
++#endif
++
++ if (proc == KEY_ENCRYPT_PK && __key_encryptsession_pk_LOCAL)
++ {
++ cryptkeyres *res;
++ res = (*__key_encryptsession_pk_LOCAL) (geteuid (), arg);
++ *(cryptkeyres *) rslt = *res;
++ return 1;
++ }
++ else if (proc == KEY_DECRYPT_PK && __key_decryptsession_pk_LOCAL)
++ {
++ cryptkeyres *res;
++ res = (*__key_decryptsession_pk_LOCAL) (geteuid (), arg);
++ *(cryptkeyres *) rslt = *res;
++ return 1;
++ }
++ else if (proc == KEY_GEN && __key_gendes_LOCAL)
++ {
++ des_block *res;
++ res = (*__key_gendes_LOCAL) (geteuid (), 0);
++ *(des_block *) rslt = *res;
++ return 1;
++ }
+
+- if (clnt == NULL) {
+- return (0);
+- }
++#ifdef SO_PASSCRED
++ return key_call_socket (proc, xdr_arg, arg, xdr_rslt, rslt);
++#else
++ if (!use_keyenvoy)
++ {
++ if (key_call_socket (proc, xdr_arg, arg, xdr_rslt, rslt))
++ return 1;
++ use_keyenvoy = 1;
++ }
++ return key_call_keyenvoy (proc, xdr_arg, arg, xdr_rslt, rslt);
++#endif
++}
+
+- wait_time.tv_sec = TOTAL_TIMEOUT;
+- wait_time.tv_usec = 0;
++#ifdef _RPC_THREAD_SAFE_
++void
++__rpc_thread_key_cleanup (void)
++{
++ struct key_call_private *kcp = RPC_THREAD_VARIABLE(key_call_private_s);
+
+- if (clnt_call(clnt, proc, xdr_arg, arg, xdr_rslt, rslt,
+- wait_time) == RPC_SUCCESS) {
+- return (1);
+- } else {
+- return (0);
++ if (kcp) {
++ if (kcp->client) {
++ if (kcp->client->cl_auth)
++ auth_destroy (kcp->client->cl_auth);
++ clnt_destroy(kcp->client);
++ }
++ free (kcp);
+ }
+ }
++#endif /* _RPC_THREAD_SAFE_ */
+diff -urN libtirpc-0.2.3/src/Makefile.am libtirpc-0.2.3.new/src/Makefile.am
+--- libtirpc-0.2.3/src/Makefile.am 2013-02-13 16:13:59.000000000 +0100
++++ libtirpc-0.2.3.new/src/Makefile.am 2013-03-19 12:24:24.368923058 +0100
+@@ -50,7 +50,7 @@
+ rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \
+ rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \
+ svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
+- auth_time.c auth_des.c authdes_prot.c
++ auth_time.c auth_des.c authdes_prot.c des_crypt.c key_call.c key_prot_xdr.c netname.c getpublickey.c rpcdname.c des_impl.c
+
+ ## XDR
+ libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-30 08:52:42 +0000