X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-perl/blobdiff_plain/bdf77f6dbd9205c70639fb682059e4ba0761c767..bfdf19cbde6d9f5cdb740d258fcc439a4a412ab0:/t/key.t

diff --git a/t/key.t b/t/key.t
index 7a8074f..0bf3754 100644
--- a/t/key.t
+++ b/t/key.t
@@ -37,13 +37,13 @@ $f = Catacomb::Key::File->new("keyring"); ok defined $f;	    #t    1
 $k = $f->bytag("tux"); ok defined $k;				    #t    2
 $d = $k->data(); ok defined $d;					    #t    3
 ok $d->flags() == KENC_STRUCT;					    #t    4
-$h = $d->structopen();
+$h = $d->open();
 ok exists $h->{"p"};						    #t    5
 ok !exists $h->{"bogus"};					    #t    6
 
 ($C, undef, $r) =
-  Catacomb::EC::Curve->getinfo($h->{"curve"}->getstring());
-$p = $C->pt($h->{"p"}->getec());
+  Catacomb::EC::Curve->getinfo($h->{"curve"}->str());
+$p = $C->pt($h->{"p"}->ec());
 ok +($p * $r)->atinfp();					    #t    7
 
 $h = $k->attrs;
@@ -54,13 +54,13 @@ ok checkhash $h, {						    #t    8
 };
 
 
-($k, $d, $n) = $f->qtag("rsa.private");
+($n, $k, $d) = $f->qtag("rsa.private");
 ok $k->type, "rsa";						    #t    9
 ok $d->flags == KENC_ENCRYPT;					    #t   10
 ok $n, sprintf("%08x:rsa.private", $k->id);			    #t   11
 
-$h = $f->bytag("rsa")->data()->structfind("private")
-  ->unlock("pass")->structopen();
+$h = $f->bytag("rsa")->data()->find("private")
+  ->unlock("pass")->open();
 ok defined $h;							    #t   12
 
 
@@ -69,9 +69,9 @@ ok defined $h;							    #t   12
   ("struct:[p=integer,public:23,q=integer,public:11],zqzqv");
 ok $rest, ",zqzqv";						    #t   13
 ok defined $kd;							    #t   14
-$h = $kd->structopen(); ok defined $h;				    #t   15
-ok $h->{"p"}->getmp() == 23;					    #t   16
-ok $h->{"q"}->getmp() == 11;					    #t   17
+$h = $kd->open(); ok defined $h;				    #t   15
+ok $h->{"p"}->mp() == 23;					    #t   16
+ok $h->{"q"}->mp() == 11;					    #t   17
 $pkd = $kd->lock("passphrase");
 ok !defined $pkd->unlock("wrong");				    #t   18
 $ukd = $pkd->unlock("passphrase"); ok defined $ukd;		    #t   19