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

diff --git a/crypto/hook.c b/crypto/hook.c
index 002c0d4..00ca7c5 100644
--- a/crypto/hook.c
+++ b/crypto/hook.c
@@ -1,24 +1,24 @@
 /*
+ * crypto - Tcl bindings for parts of the `nettle' crypto library
+ * 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
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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;
+#include "chiark_tcl_crypto.h"
 
-  return TCL_OK;
-}
+CHT_INIT(crypto,
+	 CHTI_OTHER(hbytes) CHTI_TYPE(cht_blockcipherkey_type),
+	 CHTI_COMMANDS(cht_hbcryptotoplevel_entries))