From 654944d4912fb82d39b745fb452959f22cb8d125 Mon Sep 17 00:00:00 2001 From: Jay Mundrawala Date: Fri, 29 Mar 2019 07:37:19 -0500 Subject: [PATCH 1/6] Fix up erlang 21 deprecations Taken from https://github.com/epgsql/epgsql/pull/125 --- .travis.yml | 2 ++ src/epgsql_fdatetime.erl | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3b280f62..1edc0504 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ otp_release: - 17.4 - 18.3 - 19.1 + - 19.1 + - 21.0 before_script: - psql -U postgres -c "create extension postgis" addons: diff --git a/src/epgsql_fdatetime.erl b/src/epgsql_fdatetime.erl index cc494b75..345c2f85 100644 --- a/src/epgsql_fdatetime.erl +++ b/src/epgsql_fdatetime.erl @@ -107,7 +107,7 @@ now2f({MegaSecs, Secs, MicroSecs}) -> tmodulo(T, U) -> Q = case T < 0 of true -> ceiling(T / U); - false -> floor(T / U) + false -> flooring(T / U) end, case Q of 0 -> {T, Q}; @@ -118,7 +118,7 @@ rint(N) -> round(N) * 1.0. timeround(J) -> rint(J * 10000000000.0) / 10000000000.0. tsround(J) -> rint(J * 1000000.0) / 1000000.0. -floor(X) -> +flooring(X) -> T = erlang:trunc(X), case (X - T) of N when N < 0 -> T - 1; From dd14128d8e016d8ecd3febdfcbe1c784a0aeb793 Mon Sep 17 00:00:00 2001 From: Steven Danna Date: Fri, 29 Mar 2019 12:52:08 +0000 Subject: [PATCH 2/6] Try to fix travis Signed-off-by: Steven Danna --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1edc0504..b302beba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,16 +8,20 @@ otp_release: - 17.4 - 18.3 - 19.1 - - 19.1 + - 20.3 - 21.0 before_script: - psql -U postgres -c "create extension postgis" addons: postgresql: "9.4" + apt: + packages: + - postgresql-9.6-postgis-2.3 + - postgresql-contrib-9.6 script: - ./setup_test_db.sh - pg_ctl start -D datadir/ -o "-p 10432 -k `pwd`/datadir/" - sleep 1 - make create_testdbs - make test - - pg_ctl stop -D datadir/ || true + - pg_ctl stop -D datadir/ || true From 5c681f6851cdb31c18077a0c1ef6c9754c318fbc Mon Sep 17 00:00:00 2001 From: Steven Danna Date: Fri, 29 Mar 2019 12:59:57 +0000 Subject: [PATCH 3/6] Postgresql 9.4 vs 9.6 Signed-off-by: Steven Danna --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b302beba..2dd88436 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,11 +13,13 @@ otp_release: before_script: - psql -U postgres -c "create extension postgis" addons: - postgresql: "9.4" + postgresql: "9.6" apt: packages: - postgresql-9.6-postgis-2.3 - postgresql-contrib-9.6 +env: + - PATH=".:/usr/lib/postgresql/9.6/bin:$PATH" script: - ./setup_test_db.sh - pg_ctl start -D datadir/ -o "-p 10432 -k `pwd`/datadir/" From 8736342d5903efcce4ac84d4ae8d2aee48a7fb82 Mon Sep 17 00:00:00 2001 From: Steven Danna Date: Fri, 29 Mar 2019 13:13:25 +0000 Subject: [PATCH 4/6] try this --- test/epgsql_tests.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/epgsql_tests.erl b/test/epgsql_tests.erl index 5c1b19f7..4fa59001 100644 --- a/test/epgsql_tests.erl +++ b/test/epgsql_tests.erl @@ -100,7 +100,7 @@ connect_with_client_cert_test(Module) -> {ok, _, [{Serial2}]} = Module:equery(C, "select ssl_client_serial()") end, "epgsql_test_cert", - [{ssl, true}, {keyfile, File("epgsql.key")}, {certfile, File("epgsql.crt")}]). + [{ssl, true}, {ssl_opts, [{keyfile, File("epgsql.key")}, {certfile, File("epgsql.crt")}]}]). select_test(Module) -> with_connection( From 7f7f72e4af90ae82046acf1119c3b88b24c7185e Mon Sep 17 00:00:00 2001 From: Steven Danna Date: Fri, 29 Mar 2019 13:21:32 +0000 Subject: [PATCH 5/6] Update keys Signed-off-by: Steven Danna --- test_data/epgsql.crt | 66 +++++++++++++++++++------- test_data/epgsql.key | 38 ++++++++++----- test_data/root.crt | 110 ++++++++++++++++++++++++------------------- test_data/root.key | 38 ++++++++++----- 4 files changed, 162 insertions(+), 90 deletions(-) diff --git a/test_data/epgsql.crt b/test_data/epgsql.crt index 659f9958..917916f5 100644 --- a/test_data/epgsql.crt +++ b/test_data/epgsql.crt @@ -1,18 +1,52 @@ +Certificate: + Data: + Version: 1 (0x0) + Serial Number: + 57:18:af:40:a5:9e:d6:44:ff:98:b0:68:8d:15:f9:af:14:e0:8e:c0 + Signature Algorithm: NULL + Issuer: CN = epgsql_test_cert + Validity + Not Before: Feb 17 04:16:41 2019 GMT + Not After : Feb 14 04:16:41 2029 GMT + Subject: CN = epgsql_test_cert + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (2048 bit) + Modulus: + 00:bc:79:66:ea:6b:ef:93:e5:f3:cd:aa:0d:62:57: + d7:fb:a5:2a:62:49:43:13:40:02:11:82:25:b9:cd: + 8f:67:48:13:03:2a:a0:3b:30:67:bf:1c:9c:c8:7f: + a5:10:63:c9:37:2b:bf:02:c5:d4:06:c3:63:4a:18: + 5d:05:97:64:5e:ff:ec:38:72:d8:84:33:1a:b5:26: + f3:43:50:d2:07:0d:7b:ff:38:0a:60:1f:41:0e:1c: + e3:7f:78:3c:2c:53:ec:0f:4d:e0:06:2b:ab:7f:2e: + 7a:8a:51:6e:7d:a3:17:35:0f:8e:b5:cb:c9:8d:af: + 6d:8f:ed:2d:ea:fb:c2:08:89:10:2d:98:33:60:4e: + 9f:b3:27:11:98:9d:f3:42:2b:73:dd:9c:ec:52:08: + c9:f0:f5:19:96:3c:ff:48:9e:0d:16:ed:59:c3:5a: + 46:11:cb:b4:68:e8:70:95:ec:1f:be:f5:e1:a9:4e: + 17:95:87:76:2f:e6:90:3d:4a:ae:b0:3c:95:78:fc: + 27:81:40:f6:ed:a5:7c:a2:df:a9:fb:a4:77:76:5f: + c9:d0:5c:4f:93:2d:ab:81:48:2f:0e:ae:07:d5:17: + 9c:2b:c1:f9:ca:ce:b2:f8:cd:ce:c0:7c:36:23:dc: + 1c:e0:7d:04:42:61:3f:ed:d2:cf:85:f8:77:44:ea: + 1d:c5 + Exponent: 65537 (0x10001) + Signature Algorithm: NULL -----BEGIN CERTIFICATE----- -MIIC6jCCAlOgAwIBAgIJAKwIWpOFC5EWMA0GCSqGSIb3DQEBBQUAMGQxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp -c2NvMRQwEgYDVQQKEwtsYW1iZGFXb3JrczESMBAGA1UEAxMJZXBnc3FsIENBMB4X -DTA5MDMyNzA0MzAxM1oXDTE5MDIwMzA0MzAxM1owazELMAkGA1UEBhMCVVMxEzAR -BgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xFDASBgNV -BAoTC2xhbWJkYVdvcmtzMRkwFwYDVQQDFBBlcGdzcWxfdGVzdF9jZXJ0MIGfMA0G -CSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxnVk30edKqkIWWzTeWJHlc5Zco5MASAqz -J6fC4HmR4y+StFB88NZE/ESKbWXNOD464fku72m5i4DI1NftGgZLVjjrFmLEE05S -hymkqWtVb+H9RBD2SHl4VjwDUsMDHZGiXL3n02uWF+NtpeQHkacfav10ZQO0nnub -njCUV3EHoQIDAQABo4GcMIGZMIGWBgNVHSMEgY4wgYuAFO5OzTWlO3ao7YAytIBW -A3A1GXDaoWikZjBkMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEW -MBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEUMBIGA1UEChMLbGFtYmRhV29ya3MxEjAQ -BgNVBAMTCWVwZ3NxbCBDQYIJAIFM8k/soL/qMA0GCSqGSIb3DQEBBQUAA4GBAHhy -nE3/U1DiqHNf+AaCktVoHlsjfXvfrhouqR7T84kxCjAHzM6q183ga4S9NhLeyhCT -oiDnIoUlUg7v1h9wTvXAoO2NwkCpSbIUncj6Q2h6J8obWq/BDSJwbdPcCHe4un8P -hEpkiEK1QMMm5h9d+jgE8mrgGZXMnvzw40ovJHON +MIICtjCCAZ4CFHY6YOsnigyFmdlh+oVOANI9KmmJMA0GCSqGSIb3DQEBCwUAMBQx +EjAQBgNVBAMMCWVwZ3NxbCBDQTAeFw0xOTAyMTcwNDE2NDFaFw0yOTAyMTQwNDE2 +NDFaMBsxGTAXBgNVBAMMEGVwZ3NxbF90ZXN0X2NlcnQwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQC8eWbqa++T5fPNqg1iV9f7pSpiSUMTQAIRgiW5zY9n +SBMDKqA7MGe/HJzIf6UQY8k3K78CxdQGw2NKGF0Fl2Re/+w4ctiEMxq1JvNDUNIH +DXv/OApgH0EOHON/eDwsU+wPTeAGK6t/LnqKUW59oxc1D461y8mNr22P7S3q+8II +iRAtmDNgTp+zJxGYnfNCK3PdnOxSCMnw9RmWPP9Ing0W7VnDWkYRy7Ro6HCV7B++ +9eGpTheVh3Yv5pA9Sq6wPJV4/CeBQPbtpXyi36n7pHd2X8nQXE+TLauBSC8OrgfV +F5wrwfnKzrL4zc7AfDYj3BzgfQRCYT/t0s+F+HdE6h3FAgMBAAEwDQYJKoZIhvcN +AQELBQADggEBAEtXSn7A97ZRa98Ca89JyzNTw9Huj47hP6noDHh4bcwoFcsKbAOI +7h0/goY78XJSdl1/NLnYRG4Bv+xCWr6LhrYIQXkUtaq+buGIb1sO1PqXLoVU7YtA +gpd9v9luqBIMi30YT5HHS1nKG/tNTVhqrcs1SfQ05M7KQM8wZPPaZtNm3xz6notH +rPP/1sfymjKo8mE9EZc4t6sDp1ahT34w8bSdfvqolSllsbh1dGn1jKmGg694517T +HbwMv4zACqZnR2ed2Ska3FPgL/y3TwlQfxiVHO2Fpomn5b9TOG54W/1pwKnLlKa8 +yTZx7H2jDHvsEaLHqdOytD9B6RlaL3tiDe8= -----END CERTIFICATE----- diff --git a/test_data/epgsql.key b/test_data/epgsql.key index a945b2ee..eac795c1 100644 --- a/test_data/epgsql.key +++ b/test_data/epgsql.key @@ -1,15 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/test_data/root.crt b/test_data/root.crt index 67847584..0bb3ce4f 100644 --- a/test_data/root.crt +++ b/test_data/root.crt @@ -2,62 +2,76 @@ Certificate: Data: Version: 3 (0x2) Serial Number: - 81:4c:f2:4f:ec:a0:bf:ea - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=US, ST=California, L=San Francisco, O=lambdaWorks, CN=epgsql CA + 7a:3d:30:e0:8a:4f:f3:f9:40:8b:2b:75:e8:33:fa:e4:4a:3b:7c:a8 + Signature Algorithm: sha256WithRSAEncryption + Issuer: CN = epgsql CA Validity - Not Before: Mar 27 03:52:34 2009 GMT - Not After : Feb 3 03:52:34 2019 GMT - Subject: C=US, ST=California, L=San Francisco, O=lambdaWorks, CN=epgsql CA + Not Before: Feb 17 04:16:40 2019 GMT + Not After : Feb 14 04:16:40 2029 GMT + Subject: CN = epgsql CA Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public Key: (1024 bit) - Modulus (1024 bit): - 00:bd:03:59:e5:ce:5d:24:45:ae:bf:cd:a4:4a:d4: - 33:7a:48:08:79:8a:20:4c:b6:28:51:f8:f0:9a:1d: - 1e:fb:b8:de:a3:b7:10:95:d7:a3:58:b7:94:b4:7e: - 36:0a:0c:68:1c:e8:21:a5:5d:9d:0a:3a:5d:26:dd: - bb:5b:62:59:e0:1f:b8:48:a7:3d:28:dd:f3:b9:de: - 27:d7:25:4b:f6:8a:ac:ef:a3:0e:b3:fb:1b:b8:dd: - db:01:72:01:1f:79:5b:f8:c3:54:7e:1a:94:68:1d: - 81:2c:05:11:05:2c:5b:81:05:21:19:c0:c7:94:4f: - 77:f5:76:4c:98:8d:ab:68:5b + RSA Public-Key: (2048 bit) + Modulus: + 00:a6:f4:7a:8e:90:38:4d:6e:06:00:ca:96:f6:81: + d6:ec:2d:a2:56:8e:4e:72:dc:b7:45:03:d8:b7:e1: + a5:b4:f6:29:94:b8:1d:5e:c9:24:8a:3d:c2:b3:f9: + ae:a2:02:03:d8:94:3b:ef:5b:c1:4b:54:bc:af:a3: + 53:2d:84:59:82:11:d1:82:46:5c:7f:3f:65:f9:8e: + ff:50:aa:f9:11:aa:62:cd:d3:8c:6e:a5:e3:c3:d1: + 8e:23:5a:b4:63:90:11:fc:11:17:62:a2:46:d5:19: + cf:f0:4c:55:3c:74:8c:6a:d8:34:57:46:5d:e8:6b: + 2f:a6:15:a9:4d:a3:dc:48:0b:29:ff:7e:8c:21:4b: + f1:81:fc:62:91:2a:76:42:ad:63:e6:d1:f3:37:cc: + b3:04:99:65:a5:97:47:62:fc:11:fe:d2:38:49:98: + 7c:1a:28:5b:25:47:c3:78:b4:48:16:94:db:56:4d: + c1:5a:76:1d:64:f5:af:84:47:96:38:a0:25:08:88: + 84:ea:2d:84:aa:d9:80:80:e0:b0:16:de:a2:0e:88: + 5a:61:42:50:f1:e4:39:d9:7a:5c:55:26:b8:ae:15: + 77:a8:a2:88:2a:2e:2d:de:90:a1:59:34:c3:1c:b9: + ed:3f:b0:95:8c:fc:23:ad:10:31:bc:76:9c:f7:17: + 58:f9 Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Subject Key Identifier: - EE:4E:CD:35:A5:3B:76:A8:ED:80:32:B4:80:56:03:70:35:19:70:DA + 3C:2E:F9:C6:93:9E:90:CF:F8:81:52:24:C1:7B:D4:C4:E2:8A:43:22 X509v3 Authority Key Identifier: - keyid:EE:4E:CD:35:A5:3B:76:A8:ED:80:32:B4:80:56:03:70:35:19:70:DA - DirName:/C=US/ST=California/L=San Francisco/O=lambdaWorks/CN=epgsql CA - serial:81:4C:F2:4F:EC:A0:BF:EA + keyid:3C:2E:F9:C6:93:9E:90:CF:F8:81:52:24:C1:7B:D4:C4:E2:8A:43:22 - X509v3 Basic Constraints: + X509v3 Basic Constraints: critical CA:TRUE - Signature Algorithm: sha1WithRSAEncryption - 27:4c:04:ee:27:46:23:9b:6f:7c:8f:5b:9e:c6:65:74:33:40: - 06:be:ca:e0:55:91:1c:9e:1c:77:27:82:03:4e:67:91:5d:14: - e4:74:b7:88:9e:49:d6:02:5b:71:94:b3:62:2a:5e:58:00:7d: - 8c:42:09:db:ca:27:20:71:33:16:09:d2:17:36:d4:4f:63:09: - 0a:48:80:d7:36:13:24:57:e3:7a:7e:25:4e:b8:f0:71:c6:34: - 69:4e:e1:4b:5a:ec:b3:be:14:78:1e:af:85:b2:56:91:62:03: - 6b:b2:85:2e:8e:ef:4b:5a:bf:ac:54:43:24:cb:0e:c6:f8:58: - b5:a1 + Signature Algorithm: sha256WithRSAEncryption + 8c:f8:96:3e:af:f6:fe:34:77:13:8f:c4:7d:1b:51:70:6f:aa: + d9:0d:5f:c5:50:6b:b9:86:6c:35:d2:38:18:89:37:9f:75:96: + 05:8c:7a:20:d0:cc:3c:18:d4:f1:c6:8a:5d:c2:b0:fc:fe:3a: + 20:dd:71:ea:12:a3:e8:53:06:31:00:75:54:b3:06:69:a8:71: + 36:e1:9d:e9:9d:1f:be:06:69:ea:03:16:a1:75:c6:bf:34:3d: + 18:b6:03:b9:c5:63:f7:06:21:e0:16:46:d2:d9:b4:ea:b0:1a: + fc:10:95:09:e4:b5:3c:bd:40:d8:c4:3b:2c:57:db:45:c7:ae: + 6a:8b:40:e6:2c:b1:c3:72:ce:64:10:7d:1e:e4:f7:96:04:38: + 18:b4:17:7d:4c:44:61:a6:1d:d2:cd:3a:85:c2:2e:0a:39:2c: + 28:0a:f8:97:88:51:cf:1b:7e:d5:6d:7b:93:5a:30:19:ca:13: + 34:5a:9d:ee:c1:00:95:63:21:e6:11:21:62:90:0e:8e:c9:8f: + 18:a4:40:ae:59:f8:ec:dc:7d:a5:6d:91:b2:d1:85:c2:c0:d3: + 52:3c:f3:fe:f8:27:c8:37:61:be:0e:80:2b:d2:26:1b:4d:75: + 81:22:9c:ff:21:0c:a0:64:ce:85:d4:0e:60:1e:0b:6d:04:a8: + 60:30:2b:5f -----BEGIN CERTIFICATE----- -MIIDEDCCAnmgAwIBAgIJAIFM8k/soL/qMA0GCSqGSIb3DQEBBQUAMGQxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp -c2NvMRQwEgYDVQQKEwtsYW1iZGFXb3JrczESMBAGA1UEAxMJZXBnc3FsIENBMB4X -DTA5MDMyNzAzNTIzNFoXDTE5MDIwMzAzNTIzNFowZDELMAkGA1UEBhMCVVMxEzAR -BgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xFDASBgNV -BAoTC2xhbWJkYVdvcmtzMRIwEAYDVQQDEwllcGdzcWwgQ0EwgZ8wDQYJKoZIhvcN -AQEBBQADgY0AMIGJAoGBAL0DWeXOXSRFrr/NpErUM3pICHmKIEy2KFH48JodHvu4 -3qO3EJXXo1i3lLR+NgoMaBzoIaVdnQo6XSbdu1tiWeAfuEinPSjd87neJ9clS/aK -rO+jDrP7G7jd2wFyAR95W/jDVH4alGgdgSwFEQUsW4EFIRnAx5RPd/V2TJiNq2hb -AgMBAAGjgckwgcYwHQYDVR0OBBYEFO5OzTWlO3ao7YAytIBWA3A1GXDaMIGWBgNV -HSMEgY4wgYuAFO5OzTWlO3ao7YAytIBWA3A1GXDaoWikZjBkMQswCQYDVQQGEwJV -UzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEU -MBIGA1UEChMLbGFtYmRhV29ya3MxEjAQBgNVBAMTCWVwZ3NxbCBDQYIJAIFM8k/s -oL/qMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJ0wE7idGI5tvfI9b -nsZldDNABr7K4FWRHJ4cdyeCA05nkV0U5HS3iJ5J1gJbcZSzYipeWAB9jEIJ28on -IHEzFgnSFzbUT2MJCkiA1zYTJFfjen4lTrjwccY0aU7hS1rss74UeB6vhbJWkWID -a7KFLo7vS1q/rFRDJMsOxvhYtaE= +MIIDCTCCAfGgAwIBAgIUej0w4IpP8/lAiyt16DP65Eo7fKgwDQYJKoZIhvcNAQEL +BQAwFDESMBAGA1UEAwwJZXBnc3FsIENBMB4XDTE5MDIxNzA0MTY0MFoXDTI5MDIx +NDA0MTY0MFowFDESMBAGA1UEAwwJZXBnc3FsIENBMIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEApvR6jpA4TW4GAMqW9oHW7C2iVo5Octy3RQPYt+GltPYp +lLgdXskkij3Cs/muogID2JQ771vBS1S8r6NTLYRZghHRgkZcfz9l+Y7/UKr5Eapi +zdOMbqXjw9GOI1q0Y5AR/BEXYqJG1RnP8ExVPHSMatg0V0Zd6GsvphWpTaPcSAsp +/36MIUvxgfxikSp2Qq1j5tHzN8yzBJllpZdHYvwR/tI4SZh8GihbJUfDeLRIFpTb +Vk3BWnYdZPWvhEeWOKAlCIiE6i2EqtmAgOCwFt6iDohaYUJQ8eQ52XpcVSa4rhV3 +qKKIKi4t3pChWTTDHLntP7CVjPwjrRAxvHac9xdY+QIDAQABo1MwUTAdBgNVHQ4E +FgQUPC75xpOekM/4gVIkwXvUxOKKQyIwHwYDVR0jBBgwFoAUPC75xpOekM/4gVIk +wXvUxOKKQyIwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAjPiW +Pq/2/jR3E4/EfRtRcG+q2Q1fxVBruYZsNdI4GIk3n3WWBYx6INDMPBjU8caKXcKw +/P46IN1x6hKj6FMGMQB1VLMGaahxNuGd6Z0fvgZp6gMWoXXGvzQ9GLYDucVj9wYh +4BZG0tm06rAa/BCVCeS1PL1A2MQ7LFfbRceuaotA5iyxw3LOZBB9HuT3lgQ4GLQX +fUxEYaYd0s06hcIuCjksKAr4l4hRzxt+1W17k1owGcoTNFqd7sEAlWMh5hEhYpAO +jsmPGKRArln47Nx9pW2RstGFwsDTUjzz/vgnyDdhvg6AK9ImG011gSKc/yEMoGTO +hdQOYB4LbQSoYDArXw== -----END CERTIFICATE----- diff --git a/test_data/root.key b/test_data/root.key index cb91e7ce..158ab485 100644 --- a/test_data/root.key +++ b/test_data/root.key @@ -1,15 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- From b161611b55fc38fee7663dd6e8306f7dd27e0368 Mon Sep 17 00:00:00 2001 From: Steven Danna Date: Fri, 29 Mar 2019 13:27:41 +0000 Subject: [PATCH 6/6] use crypto:strong_rand_bytes Signed-off-by: Steven Danna --- test/epgsql_perf_tests.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/epgsql_perf_tests.erl b/test/epgsql_perf_tests.erl index 3ee5616c..723e4690 100644 --- a/test/epgsql_perf_tests.erl +++ b/test/epgsql_perf_tests.erl @@ -38,7 +38,7 @@ drop_data() -> end)}. noise(N) -> - crypto:rand_bytes(N). + crypto:strong_rand_bytes(N). %%