package/libtirpc/0006-Disable-DES-authentification-support.patch

   1 From 79975eb4104667be85abd06874c258438826b674 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
   3 Date: Fri, 24 Jul 2015 14:45:52 +0200
   4 Subject: [PATCH] Disable DES authentification support
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 uClibc and musl does not provide DES authentication.
  10
  11 Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
  12 [peda@axentia.se: update for 1.0.1]
  13 Signed-off-by: Peter Rosin <peda@axentia.se>
  14 ---
  15  src/Makefile.am |  2 +-
  16  src/rpc_soc.c   | 32 --------------------------------
  17  2 files changed, 1 insertion(+), 33 deletions(-)
  18
  19 diff --git a/src/Makefile.am b/src/Makefile.am
  20 index 960a522..3a88e31 100644
  21 --- a/src/Makefile.am
  22 +++ b/src/Makefile.am
  23 @@ -22,9 +22,8 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln
  24          pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \
  25          rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \
  26          rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \
  27 -       svc_auth_des.c \
  28          svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
  29 -        auth_des.c authdes_prot.c debug.c
  30 +        debug.c
  31
  32  ## XDR
  33  libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c
  34 diff --git a/src/svc_auth.c b/src/svc_auth.c
  35 --- a/src/svc_auth.c
  36 +++ b/src/svc_auth.c
  37 @@ -114,9 +114,6 @@ _gss_authenticate(rqst, msg, no_dispatch)
  38         case AUTH_SHORT:
  39                 dummy = _svcauth_short(rqst, msg);
  40                 return (dummy);
  41 -       case AUTH_DES:
  42 -               dummy = _svcauth_des(rqst, msg);
  43 -               return (dummy);
  44  #ifdef HAVE_RPCSEC_GSS
  45         case RPCSEC_GSS:
  46                 dummy = _svcauth_gss(rqst, msg, no_dispatch);
  47 diff --git a/src/rpc_soc.c b/src/rpc_soc.c
  48 index e146ed4..161a1ec 100644
  49 --- a/src/rpc_soc.c
  50 +++ b/src/rpc_soc.c
  51 @@ -61,7 +61,6 @@ #ifdef PORTMAP
  52  #include <string.h>
  53  #include <unistd.h>
  54  #include <fcntl.h>
  55 -#include <rpcsvc/nis.h>
  56
  57  #include "rpc_com.h"
  58
  59 @@ -522,86 +521,6 @@ clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult)
  60  }
  61
  62  /*
  63 - * Create the client des authentication object. Obsoleted by
  64 - * authdes_seccreate().
  65 - */
  66 -AUTH *
  67 -authdes_create(servername, window, syncaddr, ckey)
  68 -       char *servername;               /* network name of server */
  69 -       u_int window;                   /* time to live */
  70 -       struct sockaddr *syncaddr;      /* optional hostaddr to sync with */
  71 -       des_block *ckey;                /* optional conversation key to use */
  72 -{
  73 -       AUTH *nauth;
  74 -       char hostname[NI_MAXHOST];
  75 -
  76 -       if (syncaddr) {
  77 -               /*
  78 -                * Change addr to hostname, because that is the way
  79 -                * new interface takes it.
  80 -                */
  81 -               switch (syncaddr->sa_family) {
  82 -               case AF_INET:
  83 -                 if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname,
  84 -                                 sizeof hostname, NULL, 0, 0) != 0)
  85 -                   goto fallback;
  86 -                 break;
  87 -               case AF_INET6:
  88 -                 if (getnameinfo(syncaddr, sizeof(struct sockaddr_in6), hostname,
  89 -                                 sizeof hostname, NULL, 0, 0) != 0)
  90 -                   goto fallback;
  91 -                 break;
  92 -               default:
  93 -                 goto fallback;
  94 -               }
  95 -               nauth = authdes_seccreate(servername, window, hostname, ckey);
  96 -               return (nauth);
  97 -       }
  98 -fallback:
  99 -       return authdes_seccreate(servername, window, NULL, ckey);
 100 -}
 101 -
 102 -/*
 103 - * Create the client des authentication object. Obsoleted by
 104 - * authdes_pk_seccreate().
 105 - */
 106 -extern AUTH *authdes_pk_seccreate(const char *, netobj *, u_int, const char *,
 107 -        const des_block *, nis_server *);
 108 -
 109 -AUTH *
 110 -authdes_pk_create(servername, pkey, window, syncaddr, ckey)
 111 -       char *servername;               /* network name of server */
 112 -       netobj *pkey;                   /* public key */
 113 -       u_int window;                   /* time to live */
 114 -       struct sockaddr *syncaddr;      /* optional hostaddr to sync with */
 115 -       des_block *ckey;                /* optional conversation key to use */
 116 -{
 117 -       AUTH *nauth;
 118 -       char hostname[NI_MAXHOST];
 119 -
 120 -       if (syncaddr) {
 121 -               /*
 122 -                * Change addr to hostname, because that is the way
 123 -                * new interface takes it.
 124 -                */
 125 -               switch (syncaddr->sa_family) {
 126 -               case AF_INET:
 127 -                 if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname,
 128 -                                 sizeof hostname, NULL, 0, 0) != 0)
 129 -                   goto fallback;
 130 -                 break;
 131 -               default:
 132 -                 goto fallback;
 133 -               }
 134 -               nauth = authdes_pk_seccreate(servername, pkey, window, hostname, ckey, NULL);
 135 -               return (nauth);
 136 -       }
 137 -fallback:
 138 -       return authdes_pk_seccreate(servername, pkey, window, NULL, ckey, NULL);
 139 -}
 140 -
 141 -
 142 -/*
 143   * Create a client handle for a unix connection. Obsoleted by clnt_vc_create()
 144   */
 145  CLIENT *
 146 --
 147 2.4.6
 148