terrafrost
289ae55f9f
rename ECDSA -> EC
2019-06-27 23:15:25 -05:00
terrafrost
7012e72488
mv Keys/ and Signature/ to Formats/*
2019-06-25 07:52:45 -05:00
terrafrost
d7abfaadbc
X509: rm $signatureAlgorithm parameter from signature methods
2019-06-24 18:24:14 -05:00
terrafrost
84b852933e
Merge branch '2.0'
2019-06-19 22:36:18 -05:00
terrafrost
d2085db7b7
Merge branch '1.0' into 2.0
2019-06-19 22:34:11 -05:00
terrafrost
d0014cbb20
Tests/BigInteger: add two more divide tests
2019-06-19 22:21:24 -05:00
terrafrost
0e449e8b17
X509: add support for id-RSASSA-PSS
2019-06-15 10:46:34 -05:00
terrafrost
6cf05541cc
Merge branch '1.0' into 2.0
2019-06-09 23:46:46 -05:00
terrafrost
cd7de5723c
RSA: add support for OpenSSH private keys
2019-06-09 23:42:41 -05:00
terrafrost
327f555b7c
add expanded support for OpenSSH private keys
2019-06-08 22:04:54 -05:00
terrafrost
8e03f5bfb2
RSA: make it so PSS keys can be saved
2019-06-01 19:35:17 -05:00
terrafrost
8017c74429
RSA: add preliminary support for RSA-PSS keys
2019-05-29 00:32:53 -05:00
terrafrost
89e41233e0
fix bad merge
2019-05-26 22:56:20 -05:00
terrafrost
337b41f865
Merge branch 'master' into immutable-keys
2019-05-26 22:51:40 -05:00
terrafrost
3ca5b88d58
Merge branch '1.0' into 2.0
2019-05-26 15:38:34 -05:00
terrafrost
677ae387b0
BigInteger: backport GMP fixes from master branch
2019-05-26 15:38:18 -05:00
terrafrost
50d6c8aafd
Tests/BigInteger: test for new BigInteger('-0')
2019-05-26 15:21:27 -05:00
terrafrost
fae6542efc
Merge branch '1.0' into 2.0
2019-05-26 12:17:27 -05:00
terrafrost
ade48c2cb1
Tests/BigInteger: GMP engine didn't always return 1 or -1
2019-05-26 12:13:54 -05:00
terrafrost
63f8276693
Merge branch '2.0'
2019-05-26 11:43:14 -05:00
terrafrost
77ffe153a0
Merge branch '1.0' into 2.0
2019-05-26 11:42:01 -05:00
terrafrost
e9d99a6683
Tests/BigInteger: add unit test for 0 loaded as base-10
2019-05-26 11:41:41 -05:00
terrafrost
7c270b9db3
Merge branch '2.0'
2019-05-26 10:29:34 -05:00
terrafrost
6fa2174fff
Tests/X509: update unit test to work on 2.0
2019-05-26 10:29:15 -05:00
terrafrost
7d4b724749
Merge branch '1.0' into 2.0
2019-05-26 10:28:50 -05:00
terrafrost
9e31808f61
Tests/X509: fix for last unit test
2019-05-26 10:28:21 -05:00
terrafrost
3d7acde183
Tests/X509: add unit test for long tags
2019-05-26 03:10:43 -05:00
terrafrost
c839297065
Tests/BigInteger: GMP engine didn't always return 1 or -1
2019-05-24 08:25:52 -05:00
terrafrost
7c7d500d80
System/Agent: add support for DSA / ECDSA keys
2019-05-23 08:35:36 -05:00
terrafrost
7d3b5a0c79
Tests/X509: add new tests to test DSA / ECDSA certs
2019-05-20 23:38:54 -05:00
terrafrost
cc32cd2e95
make RSA / DSA / ECDSA immutable and add support to SSH2 / X509
2019-05-19 15:35:29 -05:00
terrafrost
b09bc1883e
Merge branch 'oid-revamp-2.0'
2019-05-02 07:28:27 -05:00
terrafrost
98cbccc81a
Merge branch 'oid-revamp' into oid-revamp-2.0
2019-05-02 07:18:37 -05:00
terrafrost
e793461543
ASN1: revamp how OIDs are handled
2019-05-01 09:17:53 -05:00
terrafrost
00b6eaf507
ECDSA/Keys/PKCS8: correctly convert private keys to public
2019-04-29 21:45:17 -05:00
terrafrost
e0cbd3fe78
Tests/BigInteger: update unit test
2019-04-10 08:24:24 -05:00
terrafrost
f2226184ee
rm Common/Functions/Objects.php
2019-03-31 16:28:21 -05:00
terrafrost
c9d4a89267
rm SSH1
2019-03-29 21:51:26 -05:00
terrafrost
494d20efc8
add Salsa20 / ChaCha20 stream ciphers
2019-03-22 15:45:36 -05:00
terrafrost
17e6938fba
updates to Exceptions
2018-12-31 09:55:32 -06:00
terrafrost
01c92a59f8
add support for Galois/Counter Mode (GCM)
2018-12-27 08:31:35 -06:00
terrafrost
3dbc50c667
Merge branch 'post-ecdsa'
2018-12-16 19:03:44 -06:00
terrafrost
50f9e1a71a
Tests/AES: add unit test for encrypting without a key
2018-12-02 11:58:07 -06:00
terrafrost
d234297819
Tests/ECDSA: test to make sure that k is not re-used
2018-11-24 22:13:40 -06:00
terrafrost
3c4fbe131f
Tests/ECDSA: make tests work on PHP 5.6 (by skipping some tests)
2018-11-24 08:32:14 -06:00
terrafrost
e1961c598d
Merge branch '2.0'
2018-11-22 13:33:35 -06:00
terrafrost
ec7454dd78
Tests/X509: update test for 2.0
2018-11-22 13:23:02 -06:00
terrafrost
0cb026f5a2
Merge branch '1.0' into 2.0
2018-11-22 12:50:04 -06:00
terrafrost
431b3570fa
Tests/X509: add validatedate unit test
2018-11-22 12:40:32 -06:00
terrafrost
0398f7a815
add ECDSA / EdDSA support
2018-11-19 12:39:21 -06:00
terrafrost
4bc53f1251
Merge branch '2.0'
2018-09-17 00:29:24 -05:00
terrafrost
32ce6a0d3e
Tests/ASN1: update unit test to work on 2.0
2018-09-17 00:27:42 -05:00
terrafrost
48aa55b7f6
Merge branch '1.0' into 2.0
2018-09-17 00:27:25 -05:00
Michiel Brandenburg
b4e66d343e
Fixes #1296 parsing invalid certificate
2018-09-17 00:25:55 -05:00
terrafrost
6021e74a79
Merge branch '2.0-dsas'
2018-08-18 15:04:51 -05:00
terrafrost
82967a40d4
Merge branch '1.0-dsas' into 2.0
2018-08-18 15:03:25 -05:00
Dean Sas
6fcd8f3a6e
Remove needless assertion in rawlist test
2018-08-18 08:36:40 -05:00
Dean Sas
426dbdbfcd
Ensure SFTP::rawlist gives same results regardless of statcache
...
Previously SFTP::rawlist gave different results depending on whether the
stat cache was enabled or not. With the stat cache turned off it did not
treat directories correctly, as it relied on the stat cache even though
it was not populated.
2018-08-18 08:36:16 -05:00
terrafrost
7740d9c0c0
Hash: add sha3 support
2018-08-11 23:55:41 -05:00
terrafrost
28b26b50df
Merge branch '2.0'
2018-04-15 10:31:12 -05:00
terrafrost
bbc651f0b6
Merge branch '1.0' into 2.0
2018-04-15 10:27:46 -05:00
terrafrost
7fc3cf69f8
Tests/ASN1: add test for commit 6dc7b3e
2018-04-15 08:30:02 -05:00
terrafrost
ab270d1602
Merge branch '2.0'
2018-04-10 00:19:49 -05:00
terrafrost
4548b45b9e
Merge branch '1.0' into 2.0
2018-04-09 23:57:25 -05:00
terrafrost
48e50fe8fa
Tests/BigInteger: add test for conversion of 48 to signed hex
2018-04-09 23:36:36 -05:00
terrafrost
a3081aa7f8
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2018-04-03 20:30:27 -05:00
terrafrost
d4b0e00d14
Tests/BigInteger: make sure that zero is represented uniformly
2018-04-03 20:19:14 -05:00
Jakob Gahde
8e6948fdd2
Backport CFB8 support from master
2018-03-27 04:32:16 +02:00
terrafrost
12bd06210c
Merge pull request #1250 from luzpaz/misc-typos
...
Misc. trivial typos
2018-03-03 15:41:58 -06:00
terrafrost
6c4a108a92
Merge branch 'authority-info-access-2.0' into authority-info-access-master
2018-03-03 08:09:26 -06:00
terrafrost
40730d2977
X509: update intermediate cert changes to work on 2.0 branch
2018-03-03 07:46:03 -06:00
luz.paz
380517ef00
Misc. trivial typos
...
Found via `codespell -q 3`
2018-03-03 07:07:14 -05:00
terrafrost
87decbe94b
Merge branch 'authority-info-access-1.0' into authority-info-access-2.0
2018-03-03 00:15:29 -06:00
terrafrost
4438336d44
Tests/X509: add unit test for itermediate cert additions
2018-03-02 13:15:46 -06:00
terrafrost
2440be341d
Tests/AES: add test for ECB mode
2018-02-21 08:20:29 -06:00
terrafrost
55384afdac
RSA: make it so you can't sign w/ public key, decrypt w/ private
2018-02-18 16:03:06 -06:00
terrafrost
44ac8f3996
Merge branch '2.0'
2018-01-22 07:26:57 -06:00
terrafrost
364e05babf
Merge branch '1.0' into 2.0
2018-01-22 07:22:29 -06:00
terrafrost
8879fa0018
Tests/BigInteger: add bitwise_xor test
2018-01-22 00:18:55 -06:00
terrafrost
739d826a16
Tests/X509: update for master branch
2018-01-21 13:01:24 -06:00
terrafrost
fe71957c37
Merge branch '2.0'
2018-01-21 13:01:06 -06:00
terrafrost
bb3798c731
Tests/X509: update tests for 2.0 branch
2018-01-21 12:39:38 -06:00
terrafrost
c419f1121f
Merge branch '1.0' into 2.0
2018-01-21 12:38:35 -06:00
terrafrost
c8829e7865
Tests/X509: add unit test for #1243
2018-01-21 12:14:08 -06:00
terrafrost
ce8ad063c7
Merge branch '2.0'
2017-12-14 23:52:18 -06:00
terrafrost
b02d78e92a
Merge branch '1.0' into 2.0
2017-12-14 23:49:10 -06:00
Remi Collet
8dc8642473
allow PHPUnit 4, 5 and 6
2017-12-14 23:25:30 -06:00
terrafrost
eefcf9c941
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2017-12-14 22:49:47 -06:00
terrafrost
a5ed1acbae
Merge branch '2.0'
2017-12-14 06:34:43 -06:00
terrafrost
446652099a
Merge branch 'validation-1.0' into 2.0
2017-12-13 19:50:37 -06:00
terrafrost
340deffc98
Tests/X509: update tests to work with #1213 in 1.0
2017-12-13 19:23:12 -06:00
mdelikat
d9195ea5bd
validateSignature if subjectKeyIdentifier is not set and check serial number if is set
2017-12-13 19:05:06 -06:00
Gabriel Caruso
8eb7f3a798
Refactoring tests
2017-12-07 18:08:19 -02:00
terrafrost
0074539429
Merge branch 'array_to_short_syntax'
2017-12-04 23:03:35 -06:00
terrafrost
15863ff588
Merge branch '2.0-travis-exp' into master-travis-exp
2017-12-03 22:38:03 -06:00
terrafrost
1587c5498b
Merge branch '1.0-travis-exp' into 2.0-travis-exp
2017-12-03 20:22:57 -06:00
terrafrost
2e2c22b921
Travis: enable PHP 7.2 support
2017-12-03 15:33:15 -06:00
Sokolovskyy Roman
966ee7f170
Long array() to short [] syntax
2017-11-27 09:30:14 +01:00
terrafrost
1041131bb1
Merge branch '2.0'
2017-11-05 11:53:59 -06:00
terrafrost
12090c138e
Tests/X509: update 1.0 test to work on 2.0
2017-11-05 11:42:33 -06:00
terrafrost
d218020747
Merge branch '1.0' into 2.0
2017-11-05 11:42:08 -06:00
terrafrost
ffcff461c4
X509: URL validation didn't work ( #1203 )
2017-11-05 11:36:41 -06:00
terrafrost
5e9c67b2d0
Tests/BigInteger: re-enable primality testing in 32-bit PHP7
2017-11-04 09:42:15 -05:00
terrafrost
a5038e2fd9
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2017-10-24 07:48:24 -05:00
terrafrost
cdeeba9ecd
Tests/BigInteger: randomPrime(128) on PHP32 is just too slow
2017-10-24 00:50:48 -05:00
terrafrost
a59d046c9d
Tests/BigInteger: add unit test for randomPrime
2017-10-21 12:25:13 -05:00
Takuya Sawada
18a5867e16
Tests/AES: add newly added 'cfb8' cipher mode of operation for unit test
2017-10-05 19:06:50 +09:00
terrafrost
256ffcca7b
Merge remote-tracking branch 'pcf0/fix-biginteger-badconfigurationexception'
2017-10-01 07:53:54 +01:00
terrafrost
4f2ece4d7d
Merge remote-tracking branch 'rrran/Bugfixes2'
2017-09-30 22:50:06 +01:00
PCF
d71b6ae3e7
fixup! TestCase for BadConfigurationException in BigInteger
2017-09-30 13:44:37 +02:00
PCF
e598a027b8
fixup! TestCase for BadConfigurationException in BigInteger
2017-09-30 03:23:39 +02:00
PCF
c12ffe0b37
TestCase for BadConfigurationException in BigInteger
2017-09-30 02:46:49 +02:00
terrafrost
fc6a97083c
Merge branch '2.0'
2017-09-29 21:34:51 +01:00
Martijn Smit
b3add4491d
Replace extension_loaded with forward compatible function exists check
2017-09-29 21:33:57 +01:00
Sokolovskyy Roman
c6020a4c42
Unit tests fixes.
...
A PHPDoc fix
2017-09-14 09:42:37 +02:00
Sokolovskyy Roman
4f399d5c33
Merge remote-tracking branch 'origin/master' into Bugfixes2
2017-09-11 11:13:03 +02:00
terrafrost
8d16642469
Merge branch 'ssh2-fix-multi-channel-2.0' into ssh2-fix-multi-channel-master
2017-09-06 00:28:25 -05:00
terrafrost
74d3a51183
Merge branch 'ssh2-fix-multi-channel-1.0' into ssh2-fix-multi-channel-2.0
2017-09-06 00:27:52 -05:00
terrafrost
ed3846a7a2
Tests/SSH2: add unit test for #1167
2017-09-06 00:27:07 -05:00
Sokolovskyy Roman
25c1ae6e00
Merge remote-tracking branch 'origin/master' into Bugfixes2
2017-08-09 12:28:02 +02:00
terrafrost
04fce0b39b
Merge branch '2.0'
2017-08-08 22:04:59 -05:00
terrafrost
a9cd28d8fd
Tests/ANSI: update test for 2.0 branch
2017-08-08 21:53:37 -05:00
terrafrost
a4c79db37a
Merge branch '1.0' into 2.0
2017-08-08 21:53:07 -05:00
terrafrost
89188ec570
Tests/ANSI: add test for #1161 E_NOTICE in ANSI
2017-08-08 21:35:48 -05:00
terrafrost
9d8f014748
SymmetricKey: isValidKey took ints instead of strings
2017-08-07 23:57:02 -05:00
terrafrost
ce5eb7e1c9
Tests/X509/CRLTest: fix path for crl.bin
2017-08-07 22:35:29 -05:00
terrafrost
bd489a16dc
Tests/X509: add CRL test
2017-08-06 12:35:52 -05:00
terrafrost
135a4decf1
Tests/X509: add setEndDate
2017-08-06 10:49:03 -05:00
Sokolovskyy Roman
55cacdf7cd
More PHPDOC fixes
2017-08-04 12:06:25 +02:00
terrafrost
885dc96185
Tests/DSA: expand test to reproduce issue identified in #1151
2017-07-30 15:57:53 -05:00
terrafrost
0b34a8e543
Tests/ASN1: add additional unit test inspired by #1151
2017-07-30 11:24:58 -05:00
terrafrost
2b80803042
Merge branch '2.0'
2017-07-16 12:10:37 -05:00
terrafrost
ce2bfd984e
Tests: fix CS errors
2017-07-16 12:09:45 -05:00
terrafrost
4171262b9e
SymmetricKey: use strings for constructor and setPreferredEngine
2017-06-28 06:54:10 -05:00
terrafrost
1630a6710d
RSA/DSA: support XML keys with XML declarations
2017-06-26 21:58:20 -05:00
terrafrost
5fe629a171
BigInteger: modularize / modernize class and add new powmod engines
2017-06-26 20:07:10 -05:00
terrafrost
6a7e0210bc
Merge branch '2.0'
2017-06-22 23:37:45 -05:00
Matej Kravjar
47c419545a
Fixed #632 Fatal error: Cannot access self:: when no class scope is active
2017-06-20 12:43:42 +02:00
terrafrost
39b66d512d
Tests/RSA: update test for master branch
2017-05-29 06:34:06 -05:00
terrafrost
6ca7323401
Merge branch '2.0'
2017-05-29 06:33:24 -05:00
terrafrost
fe8f1bba7b
Tests/RSA: update unit test for 2.0 branch
2017-05-29 06:33:01 -05:00
terrafrost
a4cd384bab
Merge branch '1.0' into 2.0
2017-05-29 06:32:23 -05:00
terrafrost
f089aa4eb9
Tests/RSA: add unit test for loading bad key after loading good key
2017-05-29 06:20:46 -05:00
terrafrost
2d226b057c
Merge branch '2.0'
2017-05-28 09:11:06 -05:00
terrafrost
5e2afe3a73
Merge branch '1.0' into 2.0
2017-05-28 09:10:58 -05:00
terrafrost
9bccc01b97
Tests/SSH2: add unit test for #1009
2017-05-28 08:58:00 -05:00
terrafrost
4058e3e217
Merge pull request #1090 from terrafrost/dsa-test-2
...
add DSA implementation
2017-04-15 15:49:04 -05:00
terrafrost
0a6fe37285
Merge branch '2.0'
2017-04-09 10:30:23 -05:00
terrafrost
f4ae2cf3d3
Merge branch '1.0' into 2.0
2017-04-09 10:23:20 -05:00
Moritz Fain
7fd1eefd66
Fixed ASN.1 UTCTime parsing
2017-04-09 10:15:40 -05:00
terrafrost
22bf2339d7
Merge branch '2.0'
2017-03-07 22:20:21 -06:00
terrafrost
91a0866fdc
Tests/X509: add unit test for issue involving multiple domain names
2017-03-07 21:54:41 -06:00
terrafrost
42def63b00
Merge remote-tracking branch 'upstream/master' into dsa-test-2
2017-02-02 21:07:47 -05:00
terrafrost
ab1da5ac1f
Merge pull request #1084 from terrafrost/php5-updates
...
PHP5 updates for master branch
2017-02-02 21:03:07 -05:00
terrafrost
eb459daeaf
add DSA implementation
2017-02-02 20:20:47 -05:00
terrafrost
9220bcd49a
fix bad merge
2017-01-27 14:44:21 -06:00
terrafrost
7d2e44b430
Merge branch '2.0'
2017-01-27 12:40:23 -06:00
terrafrost
062ee6b5b5
Tests: crypt_random_string -> Random::string
2017-01-27 12:35:48 -06:00
terrafrost
ac2b7ef76c
Merge branch '1.0' into 2.0
2017-01-27 12:17:04 -06:00
terrafrost
1bde98fc42
Crypt: OpenSSL apparently supports variable size keys
2017-01-27 11:20:22 -06:00
terrafrost
b9b4f67a0f
Net: add public / private / protected
2017-01-17 10:23:28 -06:00
terrafrost
fae358cc3c
BigInteger: use public / private / protected
2017-01-05 00:20:18 -06:00
terrafrost
9ae5206588
RSA: setEngine -> setPreferredEngine (make it like SymmetricKey)
2016-12-11 09:59:50 -06:00
terrafrost
d34a911402
SymmetricCiphers: don't cache "hi-optimized code"
...
Also add a new engine - ENGINE_EVAL. Previously ENGINE_INTERNAL
had three different modes - a "hi-optimized" version, a
"lo-optimized" version and a version that didn't depend on
create_function and there wasn't a way to really isolate these
modes and test them individually.
2016-12-08 09:20:19 -06:00
terrafrost
7182ec393b
make classes with only static methods abstract
2016-11-30 09:25:04 -06:00
terrafrost
370fbec300
ASN1: don't require octet / bit strings be base64-encoded
2016-11-28 20:51:21 -06:00
terrafrost
874ada8d93
ASN1: make methods static
2016-11-27 22:38:11 -06:00
terrafrost
863ff6789b
RSA: refactor PKCS1/PKCS8 to facilitate re-use
2016-11-17 08:09:10 -06:00
Andreas Fischer
f5d8377cdb
Backport tests/bootstrap.php from 2.0 / master onto 1.0.
2016-10-20 21:30:42 +02:00
terrafrost
a862837a9a
Merge remote-tracking branch 'origin/danog2'
2016-09-23 10:20:07 -05:00
terrafrost
8019baee62
BigInteger: add randomRange / randomPrimeRange
...
...and redo random / randomPrime such that they take the byte size
as the parameter instead of the range.
2016-09-17 19:48:51 -07:00
terrafrost
c17a2604a0
Merge branch 'master-reorg'
2016-09-17 09:15:11 -07:00
terrafrost
0ee24aa218
BigInteger: rm loopforeach method
2016-09-09 20:59:54 -08:00
terrafrost
72d1bdf60b
a few changes to danog's changes
2016-09-08 00:22:30 -08:00
terrafrost
5416b9eddc
Merge branch '2.0'
2016-08-28 10:45:37 -05:00
terrafrost
6dc50cc5c9
ASN1: update unit test for 2.0 branch
2016-08-28 10:45:31 -05:00
terrafrost
281cfcdcea
Merge branch '1.0' into 2.0
2016-08-28 10:45:04 -05:00
terrafrost
5c2ffd2544
ASN1: fix infinite loop during ASN1 decode process
2016-08-28 10:43:33 -05:00
klemens
dd23d91d41
spelling fixes
2016-08-04 00:47:52 -05:00
terrafrost
c547ee16c7
Merge branch '1.0' into 2.0
2016-08-04 00:31:15 -05:00
klemens
dca95ac662
spelling fixes
2016-08-04 00:19:27 -05:00
danogentili
7cf300984c
Added root, pow, max, min, loopforeach functions and tests.
2016-08-03 10:51:19 -04:00
terrafrost
d64599f799
Move _encodeLength and _decodeLength to Common\Functions\ASN1.php
2016-07-31 09:37:13 -05:00
terrafrost
c509909004
Organizational Revamp
...
- rename \phpseclib\Crypt\Base to \phpseclib\Crypt\Common\SymmetricKey
- create BlockCipher and StreamCipher to extend SymmetricKey
- replace _string_shift with \phpseclib\Common\Functions\Strings::shift
2016-07-30 22:18:06 -05:00
terrafrost
caa7eed299
Merge branch '2.0'
2016-07-28 11:00:33 -05:00
terrafrost
e59e544ed8
Merge branch '1.0' into 2.0
2016-07-23 18:55:35 -05:00
terrafrost
62381365c8
Tests/X509: make dn more generic in unit test
2016-07-23 18:54:25 -05:00
terrafrost
f339c5adcc
Tests/X509: update test to work with master branch
2016-07-23 18:44:20 -05:00
terrafrost
a9bee37187
Merge branch '2.0'
2016-07-23 18:39:41 -05:00
terrafrost
2c4dcd96b4
fix issue with merge
2016-07-23 18:39:25 -05:00
terrafrost
dbdba0b7ef
Merge branch '1.0' into 2.0
2016-07-23 18:16:52 -05:00
terrafrost
dc7f7e4d85
ASN1: fix PHP Warning on PHP 7.1
2016-07-23 11:01:43 -05:00
terrafrost
3c1985a619
Merge branch '2.0'
2016-07-10 12:56:12 -05:00
terrafrost
97f0b37bd5
Merge branch '1.0' into 2.0
2016-07-10 12:55:56 -05:00
terrafrost
8530cbca1a
Tests/SFTP: demo "Expected SSH_FXP_STATUS or ..." error
2016-06-29 00:18:35 -05:00
terrafrost
1e7bfe75b1
Tests/RSA: fix bad merge
2016-06-22 09:47:56 -05:00
terrafrost
4516227f13
Merge branch '2.0'
2016-06-21 22:55:33 -05:00
terrafrost
9ce8a39204
Tests/RSA: update unit test to work on 2.0 branch
2016-06-21 22:39:33 -05:00
terrafrost
b08f17f514
Merge branch '1.0' into 2.0
2016-06-21 22:39:05 -05:00
terrafrost
5b8985447c
Tests/RSA: update unit test to work with 1.0 branch
2016-06-21 22:38:37 -05:00