diff options
| author | J08nY | 2017-11-10 12:56:47 +0100 |
|---|---|---|
| committer | J08nY | 2017-11-10 12:56:47 +0100 |
| commit | 588aa02a37ffd6e0ee2d164540023d1692109e89 (patch) | |
| tree | 609505ab9461fa341bb468caf092af6a563dcc61 /src/cz/crcs/ectester/data/EC_Store.java | |
| parent | 631edcfe145a558dd645dae5d83f3825a74471b1 (diff) | |
| parent | 4248ae9d9e3f6b79c9874c49ba901fba0f332211 (diff) | |
| download | ECTester-588aa02a37ffd6e0ee2d164540023d1692109e89.tar.gz ECTester-588aa02a37ffd6e0ee2d164540023d1692109e89.tar.zst ECTester-588aa02a37ffd6e0ee2d164540023d1692109e89.zip | |
Merge branch 'devel'
Diffstat (limited to 'src/cz/crcs/ectester/data/EC_Store.java')
| -rw-r--r-- | src/cz/crcs/ectester/data/EC_Store.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cz/crcs/ectester/data/EC_Store.java b/src/cz/crcs/ectester/data/EC_Store.java index 94eb011..9b1f5bb 100644 --- a/src/cz/crcs/ectester/data/EC_Store.java +++ b/src/cz/crcs/ectester/data/EC_Store.java @@ -266,11 +266,11 @@ public class EC_Store { EC_Params result; if (elem.getTagName().equals("pubkey")) { - result = new EC_Key.Public(curve.getTextContent(), descs); + result = new EC_Key.Public(id.getTextContent(), curve.getTextContent(), descs); } else if (elem.getTagName().equals("privkey")) { - result = new EC_Key.Private(curve.getTextContent(), descs); + result = new EC_Key.Private(id.getTextContent(), curve.getTextContent(), descs); } else if (elem.getTagName().equals("keypair")) { - result = new EC_Keypair(curve.getTextContent(), descs); + result = new EC_Keypair(id.getTextContent(), curve.getTextContent(), descs); } else { throw new SAXException("?"); } |