comparison marns_import.php @ 3:5c8c4fa95803 draft

Added support for transfer chaining and some bugfixes
author Ivo Smits <Ivo@UCIS.nl>
date Mon, 17 Nov 2014 01:19:05 +0100
parents caa68b502313
children
comparison
equal deleted inserted replaced
2:f6954b464d2f 3:5c8c4fa95803
89 89
90 $skey = $argv[3]; 90 $skey = $argv[3];
91 if (file_exists($skey)) { 91 if (file_exists($skey)) {
92 $skey = file_get_contents($skey); 92 $skey = file_get_contents($skey);
93 } else if (strlen($skey) == 64) { 93 } else if (strlen($skey) == 64) {
94 $skey = bin2hex($skey); 94 $skey = hex2bin($skey);
95 } else if ($skey == '-') { 95 } else if ($skey == '-') {
96 nacl_crypto_sign_ed25519_keypair($skey); 96 nacl_crypto_sign_ed25519_keypair($skey);
97 } 97 }
98 if (strlen($skey) != 32 && strlen($skey) != 64) throw new Exception('Invalid signing key specified'); 98 if (strlen($skey) != 32 && strlen($skey) != 64) throw new Exception('Invalid signing key specified');
99 99