Merge branch 'master' of https://github.com/hashcat/oclHashcat

diff --combined src/hashcat.c
index c9e69a2,0041165..de05dd3
--- 1/src/hashcat.c
--- 2/src/hashcat.c
+++ b/src/hashcat.c
@@@ -381,7 -381,7 +381,7 @@@ const char *USAGE_BIG[] 
    "     --outfile-format          | Num  | Define outfile-format X for recovered hash           | --outfile-format=7",
    "     --outfile-autohex-disable |      | Disable the use of $HEX[] in output plains           |",
    "     --outfile-check-timer     | Num  | Sets seconds between outfile checks to X             | --outfile-check=30",
-   " -p, --separator               | Char | Separator CHR  for hashlists and outfile             | -p :",
+   " -p, --separator               | Char | Separator char for hashlists and outfile             | -p :",
    "     --show                    |      | Show cracked passwords only                          |",
    "     --left                    |      | Show un-cracked passwords only                       |",
    "     --username                |      | Enable ignoring of usernames in hashfile             |",
@@@ -428,10 -428,10 +428,10 @@@
    "     --generate-rules-func-min | Num  | Force min X funcs per rule                           |",
    "     --generate-rules-func-max | Num  | Force max X funcs per rule                           |",
    "     --generate-rules-seed     | Num  | Force RNG seed set to X                              |",
-   " -1, --custom-CHR set1         | CS   | User-defined CHR set ?1                              | -1 ?l?d?u",
-   " -2, --custom-CHR set2         | CS   | User-defined CHR set ?2                              | -2 ?l?d?s",
-   " -3, --custom-CHR set3         | CS   | User-defined CHR set ?3                              |",
-   " -4, --custom-CHR set4         | CS   | User-defined CHR set ?4                              |",
+   " -1, --custom-charset1         | CS   | User-defined charset ?1                              | -1 ?l?d?u",
+   " -2, --custom-charset2         | CS   | User-defined charset ?2                              | -2 ?l?d?s",
+   " -3, --custom-charset3         | CS   | User-defined charset ?3                              |",
+   " -4, --custom-charset4         | CS   | User-defined charset ?4                              |",
    " -i, --increment               |      | Enable mask increment mode                           |",
    "     --increment-min           | Num  | Start mask incrementing at X                         | --increment-min=4",
    "     --increment-max           | Num  | Stop mask incrementing at X                          | --increment-max=8",
@@@ -733,7 -733,7 +733,7 @@@
    "  3 | High        |  96 ms  | High              | Unresponsive",
    "  4 | Nightmare   | 480 ms  | Insane            | Headless",
    "",
-   "If you have no idea what just happend then visit the following pages:",
+   "If you have no idea what just happened then visit the following pages:",
    "",
    "* https://hashcat.net/wiki/#howtos_videos_papers_articles_etc_in_the_wild",
    "* https://hashcat.net/wiki/#frequently_asked_questions",
@@@ -2760,35 -2760,7 +2760,35 @@@ static void run_copy (hc_device_param_
    }
    else if (data.attack_kern == ATTACK_KERN_COMBI)
    {
 -    if (data.attack_mode == ATTACK_MODE_HYBRID2)
 +    if (data.attack_mode == ATTACK_MODE_COMBI)
 +    {
 +      if (data.combs_mode == COMBINATOR_MODE_BASE_RIGHT)
 +      {
 +        if (data.opts_type & OPTS_TYPE_PT_ADD01)
 +        {
 +          for (u32 i = 0; i < pws_cnt; i++)
 +          {
 +            const u32 pw_len = device_param->pws_buf[i].pw_len;
 +
 +            u8 *ptr = (u8 *) device_param->pws_buf[i].i;
 +
 +            ptr[pw_len] = 0x01;
 +          }
 +        }
 +        else if (data.opts_type & OPTS_TYPE_PT_ADD80)
 +        {
 +          for (u32 i = 0; i < pws_cnt; i++)
 +          {
 +            const u32 pw_len = device_param->pws_buf[i].pw_len;
 +
 +            u8 *ptr = (u8 *) device_param->pws_buf[i].i;
 +
 +            ptr[pw_len] = 0x80;
 +          }
 +        }
 +      }
 +    }
 +    else if (data.attack_mode == ATTACK_MODE_HYBRID2)
      {
        if (data.opts_type & OPTS_TYPE_PT_ADD01)
        {