aktualizacja certyfikatow; aktualizacja linku do podpisywania JPK pro…

…filem zaufanym

certyfikaty/e-dokumenty.mf.gov.pl.crt

@@ -1,32 +1,27 @@
------BEGIN CERTIFICATE-----
-MIIFdDCCBFygAwIBAgIQCiVfqZqHu8aZTyn2bCbfpDANBgkqhkiG9w0BAQsFADCB
-ijELMAkGA1UEBhMCUEwxIjAgBgNVBAoMGVVuaXpldG8gVGVjaG5vbG9naWVzIFMu
-QS4xJzAlBgNVBAsMHkNlcnR1bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwG
-A1UEAwwlQ2VydHVtIERpZ2l0YWwgSWRlbnRpZmljYXRpb24gQ0EgU0hBMjAeFw0x
-OTA4MjIwNzM0NDdaFw0yMjA3MjgxMDQ3MDVaMIGkMQwwCgYDVQQDDANKUEsxHzAd
-BgNVBAoMFk1pbmlzdGVyc3R3byBGaW5hbnPDs3cxHzAdBgNVBAsMFk1pbmlzdGVy
-c3R3byBGaW5hbnPDs3cxETAPBgNVBAcMCFdhcnN6YXdhMRQwEgYDVQQIDAttYXpv
-d2llY2tpZTELMAkGA1UEBhMCUEwxHDAaBgkqhkiG9w0BCQEWDWpwa0BtZi5nb3Yu
-cGwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIXS6datw11cZ+xfM+
-ATFhH2MfvjcKVljXAwjWBX34jJ7rJx16Iwr3zRAU5NEkLWNlpr1PUOhffRlt8gtp
-O5HJCsvYyxBGj1VjEcwbWBOGtsHk07lzouFuZogBqSVdh0UhElrBiB2V74B9lS7c
-LSb5PHu9MCa93OOt+PgmKnrv5K8Keio1hfDhcREjOHNA4lJQ9ivBdsBLWwWjBLkl
-aVa9sft+ekCigIC5V7szQ0Mp90HcTGxXmwcwY2z6AwrjAQNRz0ubEvgjUZPdXEcU
-6XWBZjnWhXYyFCSgGBtlL29XWMaVEJXsnORdYcpxGl4I/+Zl5zNG9OhgNrVr9ffQ
-ovopAgMBAAGjggG4MIIBtDAMBgNVHRMBAf8EAjAAMDIGA1UdHwQrMCkwJ6AloCOG
-IWh0dHA6Ly9jcmwuY2VydHVtLnBsL2RpY2FzaGEyLmNybDBxBggrBgEFBQcBAQRl
-MGMwKwYIKwYBBQUHMAGGH2h0dHA6Ly9kaWNhc2hhMi5vY3NwLWNlcnR1bS5jb20w
-NAYIKwYBBQUHMAKGKGh0dHA6Ly9yZXBvc2l0b3J5LmNlcnR1bS5wbC9kaWNhc2hh
-Mi5jZXIwHwYDVR0jBBgwFoAUP8pY6vHJCX5uM8EjrU6tPj1sRacwHQYDVR0OBBYE
-FAOTfRG5FvinhKPDE/a2U5aXP9/aMB0GA1UdEgQWMBSBEmRpY2FzaGEyQGNlcnR1
-bS5wbDAOBgNVHQ8BAf8EBAMCBPAwQgYDVR0gBDswOTA3BgwqhGgBhvZ3AgUBBg4w
-JzAlBggrBgEFBQcCARYZaHR0cHM6Ly93d3cuY2VydHVtLnBsL0NQUzAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwEQYJYIZIAYb4QgEBBAQDAgWgMBgGA1Ud
-EQQRMA+BDWpwa0BtZi5nb3YucGwwDQYJKoZIhvcNAQELBQADggEBALICE2I3dUKP
-+GbufqyBwhMBeCT6oVMgN7eZ1Z+o2u0dpwmw8YH4LFWM6XlCIi5Ss8Qg2WadGWyB
-PeOTRrMxM1RT0rFO3Ay8V9xOdw6NJwZpIc2znRgteCvOuV/2mGXNWfkU3dxovLYe
-dTs1X8Q0rXpO2gEUYZ7ckl7x7veKR6Guba1/9PgGdz1FnpqfC7XIpk4TBTElQSkU
-ShYrtujPK7bZy7ZxoydgcgG0UkEN1KdT1lIJv5Lgu1qnnfLx98ZtXnF4s+6EWDYj
-cE6sxMVhhZayACNdZkWUJzHXPkgIuiLUCfzd1t2uA97pG3X7wgyQHq6w+OC/sEOq
-DUl60bStNAI=
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFYTCCBEmgAwIBAgIQNmyIMw0L5tvZNU86CvO+qjANBgkqhkiG9w0BAQsFADCBijELMAkGA1UE
+BhMCUEwxIjAgBgNVBAoMGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsMHkNlcnR1
+bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAwwlQ2VydHVtIERpZ2l0YWwgSWRlbnRp
+ZmljYXRpb24gQ0EgU0hBMjAeFw0yMjA3MjAxNTIxNDFaFw0yNTA3MTgxMzM2NTFaMIGkMQswCQYD
+VQQGEwJQTDEUMBIGA1UECAwLbWF6b3dpZWNraWUxETAPBgNVBAcMCFdhcnN6YXdhMR8wHQYDVQQL
+DBZNaW5pc3RlcnN0d28gRmluYW5zw7N3MR8wHQYDVQQKDBZNaW5pc3RlcnN0d28gRmluYW5zw7N3
+MQwwCgYDVQQDDANKUEsxHDAaBgkqhkiG9w0BCQEWDWpwa0BtZi5nb3YucGwwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDIXS6datw11cZ+xfM+ATFhH2MfvjcKVljXAwjWBX34jJ7rJx16
+Iwr3zRAU5NEkLWNlpr1PUOhffRlt8gtpO5HJCsvYyxBGj1VjEcwbWBOGtsHk07lzouFuZogBqSVd
+h0UhElrBiB2V74B9lS7cLSb5PHu9MCa93OOt+PgmKnrv5K8Keio1hfDhcREjOHNA4lJQ9ivBdsBL
+WwWjBLklaVa9sft+ekCigIC5V7szQ0Mp90HcTGxXmwcwY2z6AwrjAQNRz0ubEvgjUZPdXEcU6XWB
+ZjnWhXYyFCSgGBtlL29XWMaVEJXsnORdYcpxGl4I/+Zl5zNG9OhgNrVr9ffQovopAgMBAAGjggGl
+MIIBoTAMBgNVHRMBAf8EAjAAMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuY2VydHVtLnBs
+L2RpY2FzaGEyLmNybDBxBggrBgEFBQcBAQRlMGMwKwYIKwYBBQUHMAGGH2h0dHA6Ly9kaWNhc2hh
+Mi5vY3NwLWNlcnR1bS5jb20wNAYIKwYBBQUHMAKGKGh0dHA6Ly9yZXBvc2l0b3J5LmNlcnR1bS5w
+bC9kaWNhc2hhMi5jZXIwHwYDVR0jBBgwFoAUP8pY6vHJCX5uM8EjrU6tPj1sRacwHQYDVR0OBBYE
+FAOTfRG5FvinhKPDE/a2U5aXP9/aMB0GA1UdEgQWMBSBEmRpY2FzaGEyQGNlcnR1bS5wbDBCBgNV
+HSAEOzA5MDcGDCqEaAGG9ncCBQEGDjAnMCUGCCsGAQUFBwIBFhlodHRwczovL3d3dy5jZXJ0dW0u
+cGwvQ1BTMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDBDAOBgNVHQ8BAf8EBAMCBPAwGAYD
+VR0RBBEwD4ENanBrQG1mLmdvdi5wbDANBgkqhkiG9w0BAQsFAAOCAQEAZbUVTsT6+KMAiGWEvVrD
+j0x6uapJiuEEbozgtOk/MiQPdKS/yJitlYXh86X4pgLGebDTuW6/wQ5UgnjBcvRoEzoa69YXGCJV
+nkECbov3PxdAYX9sWKnrHCHUxMLhYhYqk3Aw4MLsslnVYabAGFrl7DlciKp1maA+sbx6N7IYBw+h
+HdS1JlSb1rdyaqUJBNOvRAKkGIAgcFzM8j49GtmJZlr4MaOMEzytNgs0upSIw3nmqATTDejNe/by
+RCZkKiBO+v4OWRbJzj0EMTSN+JIQhZPVVXyluxAuFzlNLVlPM/3KVW7WccbaE5oB2igupH9pEgEd
+jgkemkJmOlBi6QG5bA==
+-----END CERTIFICATE-----

certyfikaty/test-e-dokumenty.mf.gov.pl.crt

@@ -1,32 +1,27 @@
 -----BEGIN CERTIFICATE-----
-MIIFjjCCBHagAwIBAgIQWnLHOepkZ2NDwpgQ5lP+rzANBgkqhkiG9w0BAQsFADCB
-ijELMAkGA1UEBhMCUEwxIjAgBgNVBAoMGVVuaXpldG8gVGVjaG5vbG9naWVzIFMu
-QS4xJzAlBgNVBAsMHkNlcnR1bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwG
-A1UEAwwlQ2VydHVtIERpZ2l0YWwgSWRlbnRpZmljYXRpb24gQ0EgU0hBMjAeFw0x
-OTA4MjIxMjIxMjFaFw0yMjA4MjExMjIxMjFaMIG+MSMwIQYDVQQDDBp0ZXN0LWUt
-ZG9rdW1lbnR5Lm1mLmdvdi5wbDEeMBwGA1UECgwVTWluaXN0ZXJzdHdvIEZpbmFu
-c293MSMwIQYDVQQLDBpEZXBhcnRhbWVudCBJbmZvcm1hdHl6YWNqaTERMA8GA1UE
-BwwIV2Fyc3phd2ExFDASBgNVBAgMC21hem93aWVja2llMQswCQYDVQQGEwJQTDEc
-MBoGCSqGSIb3DQEJARYNanBrQG1mLmdvdi5wbDCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBANl7cQ9HbqEJuGY73xXO1wmxulGwT0zls5wDUCh57d+K71Oy
-wcjQJy56SKO3zeMg4m2juRycvSx+dZx6B6SOtzHPmDFy3BaP6zrtGfvHZYjCHrep
-Ms5NuYDzojq4S0TWlbHy9Hldh4Sqv76PxNqU5XU1EEluyGfMHpk7rKbyQ8LAjF/H
-drjFfaBTcf9x+lUj4csGpj9Lu/82cUQnJMkicV/5SZj8HFXS+LoVKe39ujsVtamp
-SRsv4/EUMQDOtwPFQqoFWWWYPBxmK1QqEeHQ0+m2gLPXmsPB7kvh8YzVBRRuC+iI
-0RKjO3bzjm9VZcHyiojkWlwVxvcWvqPxlQ47GD0CAwEAAaOCAbgwggG0MAwGA1Ud
-EwEB/wQCMAAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5jZXJ0dW0ucGwv
-ZGljYXNoYTIuY3JsMHEGCCsGAQUFBwEBBGUwYzArBggrBgEFBQcwAYYfaHR0cDov
-L2RpY2FzaGEyLm9jc3AtY2VydHVtLmNvbTA0BggrBgEFBQcwAoYoaHR0cDovL3Jl
-cG9zaXRvcnkuY2VydHVtLnBsL2RpY2FzaGEyLmNlcjAfBgNVHSMEGDAWgBQ/yljq
-8ckJfm4zwSOtTq0+PWxFpzAdBgNVHQ4EFgQU/VLPm/d2Ba18ITOWvKRCUd18v+cw
-HQYDVR0SBBYwFIESZGljYXNoYTJAY2VydHVtLnBsMA4GA1UdDwEB/wQEAwIE8DBC
-BgNVHSAEOzA5MDcGDCqEaAGG9ncCBQEGDjAnMCUGCCsGAQUFBwIBFhlodHRwczov
-L3d3dy5jZXJ0dW0ucGwvQ1BTMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-BDARBglghkgBhvhCAQEEBAMCBaAwGAYDVR0RBBEwD4ENanBrQG1mLmdvdi5wbDAN
-BgkqhkiG9w0BAQsFAAOCAQEAZTafUqA5IAv0vmcjYLyfTB5F0O15cEcEHGEcPDcW
-Pz4zgp00vXMofe26H6VqYmXz3Vh2J4eO+nqvgn2iMAOZkDr9w9SLtIMTK5ALBj+S
-VCgYMbdthlk3EdQ0gF8ep0i7D56lRFnoorkKGZwodHRD+EltpKUdYeR+R6telyDR
-pirMZA2CuZF9/tJ5GrkWVtJh4HVJ1L9AeOt3fgnFjn6C4c5aNVVduQD5HIKhh9hd
-IHb/DT+NGydq7DGaypxfohSFF/BZW2GYaprPv0Zk3W77LR3Bcggh79PEAw9OswW7
-5OjZzBnruTXsMkQzoyGzErVt36QZnBXs36k0o7zcgjlYuw==
+MIIFcTCCBFmgAwIBAgIQPDxch/DcTaxgm0Jni2FBsjANBgkqhkiG9w0BAQsFADCBijELMAkGA1UE
+BhMCUEwxIjAgBgNVBAoMGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsMHkNlcnR1
+bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAwwlQ2VydHVtIERpZ2l0YWwgSWRlbnRp
+ZmljYXRpb24gQ0EgU0hBMjAeFw0yMjA4MTgxMTU3MDFaFw0yNTA3MjYxMjI4MDNaMIG0MQswCQYD
+VQQGEwJQTDEUMBIGA1UECAwLbWF6b3dpZWNraWUxETAPBgNVBAcMCFdhcnN6YXdhMSMwIQYDVQQL
+DBpEZXBhcnRhbWVudCBJbmZvcm1hdHl6YWNqaTEeMBwGA1UECgwVTWluaXN0ZXJzdHdvIEZpbmFu
+c293MRkwFwYDVQQDDBB0ZXN0LWUtZG9rdW1lbnR5MRwwGgYJKoZIhvcNAQkBFg1qcGtAbWYuZ292
+LnBsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmxUn6SiIGOkkpDXcVq7hCs3ZDubg
+0cFhoHcpcwAodWIAdPQeoxoyBtXo4fq5K7ia1Uai9sZMkT2lcC393BF8VMTW9Uvn1HrYWGLMTXms
+SMkovLMP130Nf5qIpAV3mDktQxCYtrKsDIgIHFV5cN4qwJF12zA8CEwbYZzWSrIw3MGYTYF3+6kH
+H5AVIGKT57wwJaME/Kcn6G2wXVdspgzHGWYnnwt03bKHJCRfcgP1xY0F6MwvsxHqQ5SknF0uLQ2M
+sEPoHMPrlBDogJMO9VZ9Zex6tBdntNM2C3DQJMg/g8yGDxzWTnQHLRx+bFmx5BdX/VSaaazt6ZUH
+YN/XfskaBQIDAQABo4IBpTCCAaEwDAYDVR0TAQH/BAIwADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmNlcnR1bS5wbC9kaWNhc2hhMi5jcmwwcQYIKwYBBQUHAQEEZTBjMCsGCCsGAQUFBzAB
+hh9odHRwOi8vZGljYXNoYTIub2NzcC1jZXJ0dW0uY29tMDQGCCsGAQUFBzAChihodHRwOi8vcmVw
+b3NpdG9yeS5jZXJ0dW0ucGwvZGljYXNoYTIuY2VyMB8GA1UdIwQYMBaAFD/KWOrxyQl+bjPBI61O
+rT49bEWnMB0GA1UdDgQWBBQ9l+vnXAH2JIA4DmF75BiJT/J67DAdBgNVHRIEFjAUgRJkaWNhc2hh
+MkBjZXJ0dW0ucGwwQgYDVR0gBDswOTA3BgwqhGgBhvZ3AgUBBg4wJzAlBggrBgEFBQcCARYZaHR0
+cHM6Ly93d3cuY2VydHVtLnBsL0NQUzAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwDgYD
+VR0PAQH/BAQDAgTwMBgGA1UdEQQRMA+BDWpwa0BtZi5nb3YucGwwDQYJKoZIhvcNAQELBQADggEB
+AEp0lg9wIBPV3pqmoTd6llrzBW3aRPGYTi1ql1Tv0wmZY9dj96S473g1dIzfzFfg5Brmd7PCUUTo
+aPdDzbWq/WIp6w43kzfBPYEy00fbCfhi+bSHFZ2L2yUP+0JJXenRN/pYAwBAyNfJzTNTErLhTclx
+qrX/NPjtmcS2rZM2H6Zodu6KHdPVcg2S4/CDSiuSzavohJdXyvY2IUavYP2kQpaiNJ7mf8ZHNvP7
+0Ske08Hj+RRzX8GdksDkW62Ic4q9wPiNkZtGZAD/WyHNpRfkrE+a7loY/PycbymJ5XSoUi1aNNhg
+8JuETMr+QDdA+cj5AJP6BQG9w3VZyFGYmKXBMcg=
 -----END CERTIFICATE-----

saft/export.go

@@ -2,7 +2,6 @@ package saft
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"strings"
@@ -55,7 +54,7 @@ func (s *SAFT) Save(fileName string) error {
 		os.MkdirAll(dirName, 0775)
 	}
 
-	if err = ioutil.WriteFile(path.Join(dirName, "podpisz-profilem-zaufanym.url"), []byte("[InternetShortcut]\nURL=https://www.gov.pl/web/gov/podpisz-jpkvat-profilem-zaufanym"), 0644); err != nil {
+	if err = os.WriteFile(path.Join(dirName, "podpisz-profilem-zaufanym.url"), []byte("[InternetShortcut]\nURL=https://www.gov.pl/web/gov/podpisz-jpkvat-z-deklaracja-profilem-zaufanym"), 0644); err != nil {
 		return fmt.Errorf("nie udało się stworzyć pliku z linkiem do podpisu")
 	}
 
@@ -67,7 +66,13 @@ func (s *SAFT) Save(fileName string) error {
 	xml.Truncate(0)
 
 	fmt.Fprintf(xml, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
-	fmt.Fprintf(xml, "<tns:JPK xmlns:etd=\"%s\" xmlns:tns=\"%s\" xmlns:xsi=\"%s\">\n", etdXMLNS, tnsXMLNS, xsiXMLNS)
+	fmt.Fprintf(
+		xml,
+		"<tns:JPK xmlns:etd=\"%s\" xmlns:tns=\"%s\" xmlns:xsi=\"%s\">\n",
+		etdXMLNS,
+		tnsXMLNS,
+		xsiXMLNS,
+	)
 	fmt.Fprintf(xml, " <tns:Naglowek>\n")
 	s.exportSection(xml, SectionNaglowek, s.naglowek)
 	fmt.Fprintf(xml, " </tns:Naglowek>\n")