upd euspe

Author: savelja-dev

src/Client.php

@@ -19,14 +19,15 @@ private function handleResult(string $command, $iResult, int $iErrorCode = null,
   {
     if (!empty($iErrorCode) && !in_array($iErrorCode, $aAcceptableErrorCodes)) {
       euspe_geterrdescr($iErrorCode, $sErrorDescription);
+      $utfEncoding = 'utf-8';
       throw new Exception(
         sprintf(
           'Result: %s Code: %s Command: %s Error: %s. Check error in EUSignConsts.php by code.',
           dechex($iResult),
           dechex($iErrorCode),
           $command,
-          ($encoding = mb_detect_encoding($sErrorDescription)) && $encoding !== 'UTF-8' ?
-                mb_convert_encoding($sErrorDescription, $encoding, 'utf-8') :
+          ($encoding = mb_detect_encoding($sErrorDescription)) && strtolower($encoding) !== $utfEncoding ?
+                mb_convert_encoding($sErrorDescription, $encoding, $utfEncoding) :
                 $sErrorDescription
         )
       );
@@ -242,29 +243,4 @@ function envelopData(string $data, array $certs): string
     // TODO: Implement envelopData() method.
     return '';
   }
-
-  public static function getInstanceClient(string $secretToken, KeyRingStorage $keyRingStorage, User $user, bool $hasCerts): ?self
-  {
-      $client = new self();
-      $client->open();
-      $keyRing = $keyRingStorage->prepare($user);
-      if (!$keyRingStorage->exists($keyRing)) {
-          $keyRing->setPassword($user->getPassword());
-          $keyRing->setType($user->getKeyType());
-          if ($keyRing->typeIsDAT()) {
-              $keyRing->setPrivateKeys([$user->getKeyData()]);
-          } else {
-              $keyRing->setPrivateKeys($client->retrieveJKSPrivateKeys($user->getKeyData()));
-          }
-          $keyRingStorage->store($keyRing, $secretToken);
-      }
-      $keyRingStorage->load($keyRing, $secretToken);
-      if (!$hasCerts) {
-          foreach ($keyRing->getPrivateKeys() as $privateKey) {
-              $client->readPrivateKey($privateKey, $keyRing->getPassword());
-              $client->resetPrivateKey();
-          }
-      }
-      return $client;
-  }
 }