X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fsilc%2Fcore%2Fsilc-queries.c;h=18590f767e5d15defcb07a8726b9157fc07e7bf4;hb=be10e71673bc538573b1805ee2115f2a3a7281a2;hp=c81ae8626cbac5a25c4144e1835da23f3b37f5ec;hpb=8fd8212bcd16f2b53fbedff2a9b9a4e8c15b9695;p=silc.git

diff --git a/apps/irssi/src/silc/core/silc-queries.c b/apps/irssi/src/silc/core/silc-queries.c
index c81ae862..18590f76 100644
--- a/apps/irssi/src/silc/core/silc-queries.c
+++ b/apps/irssi/src/silc/core/silc-queries.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2002 - 2007 Pekka Riikonen
+  Copyright (C) 2002 - 2008 Pekka Riikonen
 
   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
@@ -292,7 +292,7 @@ void silc_query_attributes_default(SilcClient client,
     /* Put USER_INFO */
     silc_client_attribute_del(silc_client, conn,
 			      SILC_ATTRIBUTE_USER_INFO, NULL);
-    tmp = silc_file_readfile(sv, &tmp_len);
+    tmp = silc_file_readfile(sv, &tmp_len, NULL);
     if (tmp) {
       tmp[tmp_len] = 0;
       if (silc_vcard_decode(tmp, tmp_len, &vcard))
@@ -364,7 +364,8 @@ void silc_query_attributes_default(SilcClient client,
 	mask |= SILC_ATTRIBUTE_MOOD_ANXIOUS;
     }
     silc_client_attribute_add(silc_client, conn,
-			      SILC_ATTRIBUTE_STATUS_MOOD, (void *)mask,
+			      SILC_ATTRIBUTE_STATUS_MOOD,
+			      SILC_32_TO_PTR(mask),
 			      sizeof(SilcUInt32));
     g_strfreev(list);
   }
@@ -384,7 +385,7 @@ void silc_query_attributes_default(SilcClient client,
     /* Put STATUS_MESSAGE */
     silc_client_attribute_del(silc_client, conn,
 			      SILC_ATTRIBUTE_STATUS_MESSAGE, NULL);
-    tmp = silc_file_readfile(sv, &tmp_len);
+    tmp = silc_file_readfile(sv, &tmp_len, NULL);
     if (tmp) {
       mime = silc_mime_decode(NULL, tmp, tmp_len);
       if (mime)
@@ -435,7 +436,8 @@ void silc_query_attributes_default(SilcClient client,
 	mask |= SILC_ATTRIBUTE_CONTACT_VIDEO;
     }
     silc_client_attribute_add(silc_client, conn,
-			      SILC_ATTRIBUTE_PREFERRED_CONTACT, (void *)mask,
+			      SILC_ATTRIBUTE_PREFERRED_CONTACT,
+			      SILC_32_TO_PTR(mask),
 			      sizeof(SilcUInt32));
     g_strfreev(list);
   }
@@ -529,7 +531,7 @@ void silc_query_attributes_default(SilcClient client,
     list = g_strsplit(sv, " ", -1);
     for (entry = list; *entry != NULL; entry++) {
       if (!strncasecmp(*entry, "silc-rsa:", 8)) {
-	tmp = silc_file_readfile((*entry) + 8, &tmp_len);
+	tmp = silc_file_readfile((*entry) + 8, &tmp_len, NULL);
 	if (tmp) {
 	  tmp[tmp_len] = 0;
 	  pk.type = "silc-rsa";
@@ -560,6 +562,11 @@ typedef struct {
   bool nopk;
 } *AttrVerify;
 
+static void silc_query_attributes_verify(SilcBool success, void *context)
+{
+  *(SilcBool *)context = success;
+}
+
 void silc_query_attributes_print(SILC_SERVER_REC *server,
 				 SilcClient client,
 				 SilcClientConnection conn,
@@ -842,14 +849,17 @@ void silc_query_attributes_print(SILC_SERVER_REC *server,
     /* Verify the signature now */
     unsigned char *verifyd;
     SilcUInt32 verify_len;
+    SilcBool verified = FALSE;
 
     if (verify->public_key) {
       verifyd = silc_attribute_get_verify_data(attrs, FALSE, &verify_len);
-      if (verifyd && silc_pkcs_verify(verify->public_key,
-				      usersign.data,
-				      usersign.data_len,
-				      verifyd, verify_len,
-				      sha1hash)) {
+      if (verifyd)
+	silc_pkcs_verify_async(verify->public_key, usersign.data,
+			       usersign.data_len, verifyd, verify_len,
+			       TRUE, sha1hash,
+			       silc_query_attributes_verify, &verified);
+
+      if (verified) {
 	printformat_module("fe-common/silc", server, NULL,
 			   MSGLEVEL_CRAP, SILCTXT_ATTR_USER_SIGN_VERIFIED);
       } else {
@@ -873,25 +883,27 @@ void silc_query_attributes_print(SILC_SERVER_REC *server,
     SilcPKCSType type = 0;
     unsigned char *verifyd;
     SilcUInt32 verify_len;
+    SilcBool verified = FALSE;
 
-    if (!strcmp(verify->userpk.type, "silc-rsa"))
+    if (!strcmp(serverpk.type, "silc-rsa"))
       type = SILC_PKCS_SILC;
-    else if (!strcmp(verify->userpk.type, "ssh-rsa"))
+    else if (!strcmp(serverpk.type, "ssh-rsa"))
       type = SILC_PKCS_SSH2;
-    else if (!strcmp(verify->userpk.type, "x509v3-sign-rsa"))
+    else if (!strcmp(serverpk.type, "x509v3-sign-rsa"))
       type = SILC_PKCS_X509V3;
-    else if (!strcmp(verify->userpk.type, "pgp-sign-rsa"))
+    else if (!strcmp(serverpk.type, "pgp-sign-rsa"))
       type = SILC_PKCS_OPENPGP;
 
     if (silc_pkcs_public_key_alloc(type, serverpk.data,
 				   serverpk.data_len,
 				   &public_key)) {
       verifyd = silc_attribute_get_verify_data(attrs, TRUE, &verify_len);
-      if (verifyd && silc_pkcs_verify(public_key,
-				      serversign.data,
-				      serversign.data_len,
-				      verifyd, verify_len,
-				      sha1hash)) {
+      if (verifyd)
+	silc_pkcs_verify_async(public_key, serversign.data,
+			       serversign.data_len, verifyd,
+			       verify_len, TRUE, sha1hash,
+			       silc_query_attributes_verify, &verified);
+      if (verified) {
 	printformat_module("fe-common/silc", server, NULL,
 			   MSGLEVEL_CRAP, SILCTXT_ATTR_SERVER_SIGN_VERIFIED);
       } else {