[Password Generation] Start using pronouncable passwords

third_party/fips181/convert.cc

 /*
 ** Copyright (c) 1999, 2000, 2001, 2002, 2003
 ** Adel I. Mirzazhanov. 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. 
@@ skipping 15 matching lines @@
 ** NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <stdlib.h>
 #include <string.h>
 #if !defined(WIN32) && !defined(_WIN32) && !defined(__WIN32) && !defined(__WIN32__)
 #include <strings.h>
 #endif
 #ifndef APGBFM
-# include "errs.h"
-# include "randpass.h"
+#include "fips181.h"
+#include "randpass.h"
 #endif
 
+#include "base/rand_util.h"
 #include "convert.h"
 
 /*
 ** GLOBALS
 */
 
 /* small letters */
 char let[26] =
  {
  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
@@ skipping 20 matching lines @@
 ** OUTPUT:
 **   none.
 ** NOTES:
 **   none.
 */
 void
 decapitalize (char *word)
 {
  int i = 0; /* counter */
  int j = 0; /* counter */
- int str_len = strlen(word);
+ int str_len = (int) strlen(word);
  for(j = 0; j < str_len; j++)
   for(i=0; i < 26; i++)
    if(word[j] == clet[i])
        word[j] = let[i];
 }
 
 #ifndef APGBFM
 /*
 ** capitalize() - This routine designed to modify sullable like this:
 ** adel ----> Adel
 ** dot  ----> Dot
 ** etc.
 ** INPUT:
 **   char * - syllable.
 ** OUTPUT:
 **   none.
 ** NOTES:
 **   none.
 */
 void
 capitalize (char *syllable)
 {
  char tmp = 0x00;
  int i = 0;
- if ( randint(2) == TRUE)
+ if (base::RandInt(0, 1) == 1)
   {
    (void)memcpy((void *)&tmp, (void *)syllable, sizeof(tmp));
    for(i=0; i < 26; i++)
      if ( let[i] == tmp )
        if (is_restricted_symbol(clet[i]) != TRUE)
          (void)memcpy ((void *)syllable, (void *)&clet[i], 1);
   }
 }
 
 /*
 ** numerize() - This routine designed to modify single-letter
 ** syllable like this:
 ** a ----> 1 or 2 or 3 etc.
 ** u ----> 1 or 2 or 3 etc.
 ** etc.
 ** INPUT:
 **   char * - single-letter syllable
 ** OUTPUT:
 **   none.
 ** NOTES:
 **   none.
 */
 void
 numerize (char *syllable)
 {
- char *tmp;
- if ( (tmp = (char *)calloc(1, 4)) == NULL)
-    err_sys_fatal("calloc");
+ char *tmp = (char *)calloc(1, 4);
  if ( strlen (syllable) == 1 )
       {
        (void) gen_rand_symbol(tmp, S_NB);
        (void)memcpy ((void *)syllable, (void *)tmp, 1);
       }
  free ((void *)tmp);
 }
 /*
 ** specialize() - This routine designed to modify single-letter syllable
 ** like this:
 ** a ----> # or $ or % etc.
 ** u ----> # or $ or % etc.
 ** etc.
 ** INPUT:
 **   char * - single-letter syllable.
 ** OUTPUT:
 **   none.
 ** NOTES:
 **   none.
 */
 void
 specialize (char *syllable)
 {
- char *tmp;
- if ( (tmp = (char *)calloc(1, 4)) == NULL)
-    err_sys_fatal("calloc");
+ char *tmp = (char *)calloc(1, 4);
  if ( strlen (syllable) == 1 )
       {
        (void) gen_rand_symbol(tmp, S_SS);
        (void)memcpy ((void *)syllable, (void *)tmp, 1);
       }
  free ((void *)tmp);
 }
 
 /*
 ** symb2name - convert symbol to it's name
 ** INPUT:
 **   char * - one symbol syllable
 ** OUTPUT:
 **   none.
 ** NOTES:
 **   none.
 */
 void
 symb2name(char * syllable, char * h_syllable)
 {
  struct ssymb_names
   {
    char symbol;
-   char *name;
+   const char * name;
   };
- static struct ssymb_names ssn[42] =
+ static const struct ssymb_names ssn[42] =
   {
    {'1',"ONE"},
    {'2',"TWO"},
    {'3',"THREE"},
    {'4',"FOUR"},
    {'5',"FIVE"},
    {'6',"SIX"},
    {'7',"SEVEN"},
    {'8',"EIGHT"},
    {'9',"NINE"},
@@ skipping 59 matching lines @@
 **    NULL  - something is wrong
 ** NOTES:
 **   You should free() memory pointed by spelled_word after each use of spell_word
 */
 char *
 spell_word(char * word, char * spelled_word)
 {
  struct char_spell
   {
    char symbol;
-   char *name;
+   const char *name;
   };
  static struct char_spell cs[94] =
   {
    {'1',"ONE"              },
    {'2',"TWO"              },
    {'3',"THREE"            },
    {'4',"FOUR"             },
    {'5',"FIVE"             },
    {'6',"SIX"              },
    {'7',"SEVEN"            },
@@ skipping 81 matching lines @@
    {95, "UNDERSCORE"       },
    {96, "GRAVE"            },
    {123, "LEFT_BRACE"      },
    {124, "VERTICAL_BAR"    },
    {125, "RIGHT_BRACE"     },
    {126, "TILDE"           }
   };
   int s_length = 0;
   int i = 0;
   int j = 0;
-  int word_len = strlen(word);
+  int word_len = (int) strlen(word);
   char * tmp_ptr;
   char hyphen = '-';
   char zero   = 0x00;
   
   /* Count the length of the spelled word */
   for (i=0; i <= word_len; i++)
    for (j=0; j < 94; j++)
     if (word[i] == cs[j].symbol)
      {
-      s_length = s_length + strlen(cs[j].name) + 1;
+      s_length = s_length + (int) strlen(cs[j].name) + 1;
       continue;
      }
 
   /* Allocate memory for spelled word */
   if ( (spelled_word = (char *)calloc(1, (size_t)s_length)) == NULL)
     return(NULL);
 
   /* Construct spelled word */
   tmp_ptr = spelled_word;
 
@@ skipping 10 matching lines @@
      }
 
   /* Remove hyphen at the end of the word */
   tmp_ptr = tmp_ptr - 1;
   (void) memcpy((void *)(tmp_ptr), (void *)&zero, 1);
 
   return (spelled_word);
 }
 
 #endif /* APGBFM */