X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=crypto%2Fhook.c;h=00ca7c50a53f19e5dd7fbd1ac9f77cd4f08e8c36;hb=cf8e1e165e29df4b0e161751e9e952b75236c932;hp=f8c567fe4dfc65da87412cee6fc31a95c3e73f5b;hpb=5dca360f2da544c9b6baf9d18ad8cd0b0e073e60;p=chiark-tcl.git

diff --git a/crypto/hook.c b/crypto/hook.c
index f8c567f..00ca7c5 100644
--- a/crypto/hook.c
+++ b/crypto/hook.c
@@ -1,6 +1,6 @@
 /*
  * crypto - Tcl bindings for parts of the `nettle' crypto library
- * Copyright 2006 Ian Jackson
+ * Copyright 2006-2012 Ian Jackson
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -13,30 +13,12 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
 #include "chiark_tcl_crypto.h"
 
-int cht_do_hbcryptotoplevel_hbcrypto(ClientData cd, Tcl_Interp *ip,
-		       const HBCrypto_SubCommand *subcmd,
-		       int objc, Tcl_Obj *const *objv) {
-  return subcmd->func(0,ip,objc,objv);
-}
-
-extern int Chiark_tcl_crypto_Init(Tcl_Interp *ip); /*called by load(3tcl)*/
-int Chiark_tcl_crypto_Init(Tcl_Interp *ip) {
-  static int initd;
-  int rc;
-
-  rc= Chiark_tcl_hbytes_Init(ip);  if (rc) return rc;
-  rc= cht_initextension(ip, cht_hbcryptotoplevel_entries, &initd,
-			&cht_blockcipherkey_type,
-			(Tcl_ObjType*)0);
-  if (rc) return rc;
-
-  return TCL_OK;
-}
+CHT_INIT(crypto,
+	 CHTI_OTHER(hbytes) CHTI_TYPE(cht_blockcipherkey_type),
+	 CHTI_COMMANDS(cht_hbcryptotoplevel_entries))