Overview
| Comment: | Added support for hashing arbitrary data |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
54a51a61b6184547a8fa1d013654f886 |
| User & Date: | rkeene on 2018-07-01 22:04:45 |
| Other Links: | manifest | tags |
Context
|
2018-07-01
| ||
| 22:12 | Start of support for key generation check-in: 28166744a1 user: rkeene tags: trunk | |
| 22:04 | Added support for hashing arbitrary data check-in: 54a51a61b6 user: rkeene tags: trunk | |
| 21:50 | Added validation to verification check-in: 027525ece7 user: rkeene tags: trunk | |
Changes
Modified build/test/test.tcl from [45be124a0a] to [aa86c2ee6b].
1 2 3 4 5 6 | #! /usr/bin/env tclsh lappend auto_path [file join [file dirname [info script]] .. ..] package require nano | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 |
#! /usr/bin/env tclsh
lappend auto_path [file join [file dirname [info script]] .. ..]
package require nano
proc test_signatures {} {
# Detached signature
set data [binary decode hex 0000000000000000000000000000000000000000000000000000000000000000]
set key [binary decode hex C4D214F19E706E9C7487CEF00DE8059200C32414F0ED82E5E33B523AEDF719BA]
set sig [string toupper [binary encode hex [::nano::internal::signDetached $data $key]]]
set sig_expected 1C2DE9B8A71215F949A11BBEA7EFA4ECD67A8C2B5A9AD98AE6B1AB7F7A3D2CFD715F570309148C7B39C346FB9B91B321D7E75BD598F271AF31AB60A99D086709
if {$sig ne $sig_expected} {
|
| ︙ | ︙ | |||
46 47 48 49 50 51 52 |
set pubKey [binary decode hex "7E0008FAD05BD9E22A8DEBA963CE3C9C769BC01B00974226D264C9078A7A98A8"]
set verified [::nano::internal::verifyDetached $data $sig $pubKey]
if {$verified} {
puts "\[FAIL\] Got: $verified"
puts "\[FAIL\] Exp: false"
return false
}
| | > | > > | > > > > > > > > > > > > > > > > > > > > > > > > > > | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 |
set pubKey [binary decode hex "7E0008FAD05BD9E22A8DEBA963CE3C9C769BC01B00974226D264C9078A7A98A8"]
set verified [::nano::internal::verifyDetached $data $sig $pubKey]
if {$verified} {
puts "\[FAIL\] Got: $verified"
puts "\[FAIL\] Exp: false"
return false
}
return true
}
proc test_hashing {} {
# Basic test
set data [binary decode hex 4451686437A2BF5C4759100DE2ADE0F39B6877275AF997906B71B1A8EF1550A2]
set hash [binary encode hex [::nano::internal::hashData $data]]
set hash_expected "84ac733547d71c312e707508646008a9d8f84f7093e60ca91e4eb376365ac1921fdde6e8ccb3875ea12369d9f6fb02237f51f4c05f3555e57d11800deda7319f"
if {$hash ne $hash_expected} {
puts "\[FAIL\] Got: $hash"
puts "\[FAIL\] Exp: $hash_expected"
return false
}
return true
}
set tests {
signatures
hashing
}
foreach test $tests {
if {![test_$test]} {
puts "FAILED test $test"
exit 1
}
}
exit 0
|
Modified nano.c from [ca961d2702] to [df3e692dc7].
1 2 3 4 5 6 7 8 9 10 11 12 |
#include <tcl.h>
#include <stdint.h>
#include <limits.h>
#include <string.h>
#include "tweetnacl.h"
#if 0
#include <sys/random.h>
void randombytes(uint8_t *buffer, uint64_t length) {
ssize_t gr_ret;
| > | 1 2 3 4 5 6 7 8 9 10 11 12 13 |
#include <tcl.h>
#include <stdint.h>
#include <limits.h>
#include <string.h>
#include "tweetnacl.h"
#include "blake2-supercop.h"
#if 0
#include <sys/random.h>
void randombytes(uint8_t *buffer, uint64_t length) {
ssize_t gr_ret;
|
| ︙ | ︙ | |||
236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 |
Tcl_SetObjResult(interp, Tcl_NewBooleanObj(result));
return(TCL_OK);
/* NOTREACH */
clientData = clientData;
}
int Nano_Init(Tcl_Interp *interp) {
#ifdef USE_TCL_STUBS
const char *tclInitStubs_ret;
/* Initialize Stubs */
tclInitStubs_ret = Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 0);
if (!tclInitStubs_ret) {
return(TCL_ERROR);
}
#endif
Tcl_CreateObjCommand(interp, "::nano::internal::signDetached", nano_tcl_sign_detached, NULL, NULL);
Tcl_CreateObjCommand(interp, "::nano::internal::publicKey", nano_tcl_secret_key_to_public_key, NULL, NULL);
Tcl_CreateObjCommand(interp, "::nano::internal::verifyDetached", nano_tcl_verify_detached, NULL, NULL);
return(TCL_OK);
}
| > > > > > > > > > > > > > > > > > > > > > > | 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 |
Tcl_SetObjResult(interp, Tcl_NewBooleanObj(result));
return(TCL_OK);
/* NOTREACH */
clientData = clientData;
}
static int nano_tcl_hash_data(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) {
unsigned char *data, result[crypto_sign_BYTES];
int data_length, result_length;
if (objc != 2) {
Tcl_WrongNumArgs(interp, 1, objv, "data");
return(TCL_ERROR);
}
data = Tcl_GetByteArrayFromObj(objv[1], &data_length);
crypto_hash(result, data, data_length);
result_length = sizeof(result);
Tcl_SetObjResult(interp, Tcl_NewByteArrayObj(result, result_length));
return(TCL_OK);
/* NOTREACH */
clientData = clientData;
}
int Nano_Init(Tcl_Interp *interp) {
#ifdef USE_TCL_STUBS
const char *tclInitStubs_ret;
/* Initialize Stubs */
tclInitStubs_ret = Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 0);
if (!tclInitStubs_ret) {
return(TCL_ERROR);
}
#endif
Tcl_CreateObjCommand(interp, "::nano::internal::signDetached", nano_tcl_sign_detached, NULL, NULL);
Tcl_CreateObjCommand(interp, "::nano::internal::publicKey", nano_tcl_secret_key_to_public_key, NULL, NULL);
Tcl_CreateObjCommand(interp, "::nano::internal::verifyDetached", nano_tcl_verify_detached, NULL, NULL);
Tcl_CreateObjCommand(interp, "::nano::internal::hashData", nano_tcl_hash_data, NULL, NULL);
return(TCL_OK);
}
|