mask-map is hbytes subcommand

diff --git a/base/hook.c b/base/hook.c
index 8ef140fb452403e44a5be1719f71608cd4b01908..2d59baa5fce7581083a346abaeaec1872e6cb949 100644 (file)
--- a/base/hook.c
+++ b/base/hook.c
@@ -324,6 +324,12 @@ int do_hbytes_range(ClientData cd, Tcl_Interp *ip,
   return TCL_OK;
 }
 
   return TCL_OK;
 }
 

+int do_hbytes_mask_map(ClientData cd, Tcl_Interp *ip,
+                     const MaskMap_SubCommand *subcmd,
+                     int objc, Tcl_Obj *const *objv) {
+  return subcmd->func(0,ip,objc,objv);
+}
+

 /* hbytes representing uint16_t's */
 
 int do_hbytes_h2ushort(ClientData cd, Tcl_Interp *ip,
 /* hbytes representing uint16_t's */
 
 int do_hbytes_h2ushort(ClientData cd, Tcl_Interp *ip,


@@ -380,12 +386,6 @@ int do_toplevel_ulong(ClientData cd, Tcl_Interp *ip,
   return subcmd->func(0,ip,objc,objv);
 }
 
   return subcmd->func(0,ip,objc,objv);
 }
 

-int do_toplevel_mask_map(ClientData cd, Tcl_Interp *ip,
-                     const MaskMap_SubCommand *subcmd,
-                     int objc, Tcl_Obj *const *objv) {
-  return subcmd->func(0,ip,objc,objv);
-}
-

 #define URANDOM "/dev/urandom"
 
 int get_urandom(Tcl_Interp *ip, Byte *buffer, int l) {
 #define URANDOM "/dev/urandom"
 
 int get_urandom(Tcl_Interp *ip, Byte *buffer, int l) {

diff --git a/base/tables-examples.tct b/base/tables-examples.tct
index 235f7702f54ca37ad0e6b8c9bb9186728546bbe6..83961304d14e359091df7fb61a6ba014ba37cb8f 100644 (file)
--- a/base/tables-examples.tct
+++ b/base/tables-examples.tct
@@ -34,9 +34,6 @@ Table toplevel TopLevel_Command
        ulong
                subcmd  enum(ULong_SubCommand,"ulong subcommand")
                ...     obj
        ulong
                subcmd  enum(ULong_SubCommand,"ulong subcommand")
                ...     obj

-       mask-map
-               subcmd  enum(MaskMap_SubCommand, "hbytes mask-map subcommand")
-               ...     obj

 
 Table maskmap MaskMap_SubCommand
        lookup
 
 Table maskmap MaskMap_SubCommand
        lookup


@@ -182,6 +179,9 @@ Table hbytes HBytes_SubCommand
                prop    enum(HashAlgPropInfo, "prop")
                alg     enum(HashAlgInfo, "alg")
                =>      int
                prop    enum(HashAlgPropInfo, "prop")
                alg     enum(HashAlgInfo, "alg")
                =>      int

+       mask-map
+               subcmd  enum(MaskMap_SubCommand, "hbytes mask-map subcommand")
+               ...     obj

 
 Table padmethodinfo PadMethodInfo
        pkcs5
 
 Table padmethodinfo PadMethodInfo
        pkcs5

diff --git a/hbytes/hook.c b/hbytes/hook.c
index 8ef140fb452403e44a5be1719f71608cd4b01908..2d59baa5fce7581083a346abaeaec1872e6cb949 100644 (file)
--- a/hbytes/hook.c
+++ b/hbytes/hook.c
@@ -324,6 +324,12 @@ int do_hbytes_range(ClientData cd, Tcl_Interp *ip,
   return TCL_OK;
 }
 
   return TCL_OK;
 }
 

+int do_hbytes_mask_map(ClientData cd, Tcl_Interp *ip,
+                     const MaskMap_SubCommand *subcmd,
+                     int objc, Tcl_Obj *const *objv) {
+  return subcmd->func(0,ip,objc,objv);
+}
+

 /* hbytes representing uint16_t's */
 
 int do_hbytes_h2ushort(ClientData cd, Tcl_Interp *ip,
 /* hbytes representing uint16_t's */
 
 int do_hbytes_h2ushort(ClientData cd, Tcl_Interp *ip,


@@ -380,12 +386,6 @@ int do_toplevel_ulong(ClientData cd, Tcl_Interp *ip,
   return subcmd->func(0,ip,objc,objv);
 }
 
   return subcmd->func(0,ip,objc,objv);
 }
 

-int do_toplevel_mask_map(ClientData cd, Tcl_Interp *ip,
-                     const MaskMap_SubCommand *subcmd,
-                     int objc, Tcl_Obj *const *objv) {
-  return subcmd->func(0,ip,objc,objv);
-}
-

 #define URANDOM "/dev/urandom"
 
 int get_urandom(Tcl_Interp *ip, Byte *buffer, int l) {
 #define URANDOM "/dev/urandom"
 
 int get_urandom(Tcl_Interp *ip, Byte *buffer, int l) {