Merge branch '2.0'

* 2.0:
  DES: fix fatal error that could occur under special circumstances
This commit is contained in:
Andreas Fischer 2015-03-21 17:54:27 +01:00
commit b70ed2e860

View File

@ -1343,8 +1343,8 @@ class DES extends Base
$k[self::ENCRYPT][$i] = '$ke[' . $i . ']'; $k[self::ENCRYPT][$i] = '$ke[' . $i . ']';
$k[self::DECRYPT][$i] = '$kd[' . $i . ']'; $k[self::DECRYPT][$i] = '$kd[' . $i . ']';
} }
$init_encrypt = '$ke = $self->keys[self::ENCRYPT];'; $init_encrypt = '$ke = $self->keys[$self::ENCRYPT];';
$init_decrypt = '$kd = $self->keys[self::DECRYPT];'; $init_decrypt = '$kd = $self->keys[$self::DECRYPT];';
break; break;
} }