Print this page
3882 remove xmod & friends

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libsldap/common/ns_crypt.c
          +++ new/usr/src/lib/libsldap/common/ns_crypt.c
↓ open down ↓ 32 lines elided ↑ open up ↑
  33   33  #include <string.h>
  34   34  #include <libintl.h>
  35   35  #include <locale.h>
  36   36  #include <errno.h>
  37   37  #include <unistd.h>
  38   38  #include <ctype.h>
  39   39  #include <syslog.h>
  40   40  #include <sys/time.h>
  41   41  #include "ns_sldap.h"
  42   42  #include "ns_internal.h"
  43      -/* EXPORT DELETE START */
  44   43  #include <crypt.h>
  45   44  
  46      -#define NS_DOMESTIC     1
  47      -
  48   45  static  char            t1[ROTORSIZE];
  49   46  static  char            t2[ROTORSIZE];
  50   47  static  char            t3[ROTORSIZE];
  51   48  static  char            hexdig[] = "0123456789abcdef";
  52   49  
  53   50  static mutex_t          ns_crypt_lock = DEFAULTMUTEX;
  54   51  static boolean_t        crypt_inited = B_FALSE;
  55   52  
  56   53  static int
  57   54  is_cleartext(const char *pwd)
↓ open down ↓ 48 lines elided ↑ open up ↑
 106  103                  if (++anHexaStr != '\0') {
 107  104                          theRes[theLen] += unhex(*anHexaStr);
 108  105                          anHexaStr++;
 109  106                  }
 110  107                  theLen++;
 111  108          }
 112  109          theRes[theLen] = '\0';
 113  110          *aResLen = theLen;
 114  111          return (theRes);
 115  112  }
 116      -/* EXPORT DELETE END */
 117  113  
 118  114  
 119  115  static void
 120  116  c_setup()
 121  117  {
 122      -/* EXPORT DELETE START */
 123  118          int ic, i, k, temp;
 124  119          unsigned random;
 125  120          char buf[13];
 126  121          int seed;
 127  122  
 128  123          (void) mutex_lock(&ns_crypt_lock);
 129  124          if (crypt_inited) {
 130  125                  (void) mutex_unlock(&ns_crypt_lock);
 131  126                  return;
 132  127          }
↓ open down ↓ 50 lines elided ↑ open up ↑
 183  178                          n1 = 0;
 184  179                          n2++;
 185  180                          if (n2 == ROTORSIZE) n2 = 0;
 186  181                      }
 187  182                  }
 188  183                  s[i] = '\0';
 189  184                  if (mod_len != NULL)
 190  185                      *mod_len = i;
 191  186          }
 192  187          return (s);
 193      -/* EXPORT DELETE END */
 194  188  }
 195  189  
 196  190  
 197  191  char *
 198  192  evalue(char *ptr)
 199  193  {
 200      -/* EXPORT DELETE START */
 201  194          char *modv, *str, *ev;
 202  195          int modv_len;
 203  196          size_t len;
 204  197  
 205  198          /*
 206  199           * if not cleartext, return a copy of what ptr
 207  200           * points to as that is what evalue does below.
 208  201           */
 209  202          if (FALSE == is_cleartext(ptr)) {
 210  203                  str = strdup(ptr);
↓ open down ↓ 7 lines elided ↑ open up ↑
 218  211          len = strlen(str) + strlen(CRYPTMARK) + 1;
 219  212          ev = malloc(len);
 220  213          if (ev == NULL) {
 221  214                  free(str);
 222  215                  return (NULL);
 223  216          }
 224  217          (void) snprintf(ev, len, CRYPTMARK "%s", str);
 225  218          free(str);
 226  219          str = NULL;
 227  220          return (ev);
 228      -#ifndef NS_DOMESTIC
 229      -/* EXPORT DELETE END */
 230      -        return (strdup(ptr));
 231      -/* EXPORT DELETE START */
 232      -#endif
 233      -/* EXPORT DELETE END */
 234  221  }
 235  222  
 236  223  
 237  224  char *
 238  225  dvalue(char *ptr)
 239  226  {
 240      -/* EXPORT DELETE START */
 241  227          char *modv, *str, *sb;
 242  228          int len;
 243  229  
 244  230          /* if cleartext return NULL (error!) */
 245  231          if (TRUE == is_cleartext(ptr))
 246  232                  return (NULL);
 247  233  
 248  234          sb = strchr(ptr, '}');
 249  235          sb++;
 250  236          len = strlen(sb);
 251  237          str = ascii2hex(sb, &len);
 252  238          modv = modvalue(str, len, NULL);
 253  239          free(str);
 254  240          str = NULL;
 255  241          return (modv);
 256      -#ifndef NS_DOMESTIC
 257      -/* EXPORT DELETE END */
 258      -        return (strdup(ptr));
 259      -/* EXPORT DELETE START */
 260      -#endif
 261      -/* EXPORT DELETE END */
 262  242  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX