Fix BankX509Generator

Author: andrew-svirin

CHANGELOG.md

@@ -8,6 +8,7 @@
 * Added `Parameter` to BTF.
 * Added `HAC` order type.
 * Fix Upload orders Digest.
+* Fix `BankX509Generator`
 
 ## 2.5
 

src/Models/X509/BankX509Generator.php

@@ -30,12 +30,14 @@ public function setCertificateOptionsByBank(Bank $bank): void
                 'DN' => [
                     'id-at-countryName' => $countryName,
                     'id-at-commonName' => $domainName,
+                    'id-at-organizationName' => $establishmentName,
                 ],
             ],
             'issuer' => [
                 'DN' => [
                     'id-at-countryName' => $countryName,
-                    'id-at-commonName' => $establishmentName,
+                    'id-at-commonName' => $domainName,
+                    'id-at-organizationName' => $establishmentName,
                 ],
             ],
         ];

tests/Factories/X509/X509GeneratorTest.php

@@ -93,20 +93,20 @@ private function assertCertificateEquals(string $generatedContent, string $fileC
     private function getCertificateContent()
     {
         return '-----BEGIN CERTIFICATE-----
-MIICcDCCAdmgAwIBAgJLNTM5NDUzNTEwODUyMTU1MTk0MDY1MjMzOTA4NDEzMzQy
+MIIClDCCAf2gAwIBAgJLNTM5NDUzNTEwODUyMTU1MTk0MDY1MjMzOTA4NDEzMzQy
 Nzg5MTU2NTQyMzk1OTU2NjcwMjU0NDc2MTU0OTY4NTk3NTgzMDU1OTQwMA0GCSqG
-SIb3DQEBCwUAMBwxCzAJBgNVBAYMAkVVMQ0wCwYDVQQDDARCYW5rMB4XDTIwMDMy
-MTAwMDAwMFoXDTIxMDMyMjAwMDAwMFowIjELMAkGA1UEBgwCRVUxEzARBgNVBAMM
-CiouYmFuay5kb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAIzB7E84N4lz
-CyS7IiMipDakOQjqTgcRWel8Y51zjH2MXRwVifil3An0x3PoaqCgcuNYfYPWsofW
-MSw4VP2Sz5DIdG0ob+r2XIKvO4GjpxhNdTwyCL1RIz5nvQng1VIUo5s4LP/d4mvP
-h8N73nkMQyqFz5WSZeXI452IrLs+LZtvAgMBAAGjcjBwMB0GA1UdDgQWBBREAqUl
-0PKgjXu8AEk9bu5fsVn5NzAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwME
-MA4GA1UdDwEB/wQEAwIGQDAfBgNVHSMEGDAWgBREAqUl0PKgjXu8AEk9bu5fsVn5
-NzANBgkqhkiG9w0BAQsFAAOBgQBsP7IphhIuI5ThodkmWGYBWntTaAUcTwjE8ahs
-cJjN3WKFoc/4MD/bmbKGprfnDhsHjWVHhcNftbMAO54PSwewp4v0YtM4MOYp2DLJ
-/r8u2KXJOjpIYCzk22IPWXtADArHHC1zyFgP2eEBM3ZjwN99M9gh49oMuwHai779
-jjaKcA==
+SIb3DQEBCwUAMDExCzAJBgNVBAYMAkVVMRMwEQYDVQQDDAoqLmJhbmsuZG9tMQ0w
+CwYDVQQKDARCYW5rMB4XDTIwMDMyMTAwMDAwMFoXDTIxMDMyMjAwMDAwMFowMTEL
+MAkGA1UEBgwCRVUxEzARBgNVBAMMCiouYmFuay5kb20xDTALBgNVBAoMBEJhbmsw
+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAIzB7E84N4lzCyS7IiMipDakOQjq
+TgcRWel8Y51zjH2MXRwVifil3An0x3PoaqCgcuNYfYPWsofWMSw4VP2Sz5DIdG0o
+b+r2XIKvO4GjpxhNdTwyCL1RIz5nvQng1VIUo5s4LP/d4mvPh8N73nkMQyqFz5WS
+ZeXI452IrLs+LZtvAgMBAAGjcjBwMB0GA1UdDgQWBBREAqUl0PKgjXu8AEk9bu5f
+sVn5NzAJBgNVHRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMEMA4GA1UdDwEB/wQE
+AwIGQDAfBgNVHSMEGDAWgBREAqUl0PKgjXu8AEk9bu5fsVn5NzANBgkqhkiG9w0B
+AQsFAAOBgQBD0STyIBabCiF2Xpg59bdEWO+8vtVSqAle7ssb2os/aiMaGs9YV5HY
+uFgfmZRGEOwtPoCgPK8iNO5lIQ3VGxpZLHk4/NwV3yDUzgRJzHkJY6+qnR/ALKiK
+DM+AGa/BdG5Xgy6Prg4KYSsfP+iPeOKezI2tukNGYLxb8U879FmuVg==
 -----END CERTIFICATE-----';
     }
 

tests/Services/BankLetter/HashGeneratorTest.php

@@ -62,7 +62,7 @@ public function testGenerateCertificateHashV2()
 
         $hash = $digestResolver->confirmDigest($signature);
 
-        self::assertEquals('d6267bf288495631f9e2731f48e1d7f243b86448089f8adbb769288dda485c04', $hash);
+        self::assertEquals('2ed0ab3715fbddb7e516290a6d757c556917715be7a552359c81a8b1b9b22162', $hash);
     }
 
     /**
@@ -100,7 +100,7 @@ public function testGenerateCertificateHashV3()
 
         $hash = $digestResolver->confirmDigest($signature);
 
-        self::assertEquals('d6267bf288495631f9e2731f48e1d7f243b86448089f8adbb769288dda485c04', $hash);
+        self::assertEquals('2ed0ab3715fbddb7e516290a6d757c556917715be7a552359c81a8b1b9b22162', $hash);
     }
 
     /**