projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added support for the new PKCS API, Auth API and other API
[silc.git]
/
apps
/
irssi
/
src
/
silc
/
core
/
silc-queries.c
diff --git
a/apps/irssi/src/silc/core/silc-queries.c
b/apps/irssi/src/silc/core/silc-queries.c
index 271e3d5e77b41d44ad8e18df7ab5cc68198a15f2..664eece66117fdb6cffb98d86b102a625c533fe8 100644
(file)
--- a/
apps/irssi/src/silc/core/silc-queries.c
+++ b/
apps/irssi/src/silc/core/silc-queries.c
@@
-560,6
+560,11
@@
typedef struct {
bool nopk;
} *AttrVerify;
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,
void silc_query_attributes_print(SILC_SERVER_REC *server,
SilcClient client,
SilcClientConnection conn,
@@
-842,14
+847,16
@@
void silc_query_attributes_print(SILC_SERVER_REC *server,
/* Verify the signature now */
unsigned char *verifyd;
SilcUInt32 verify_len;
/* 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 (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(verify->public_key, usersign.data,
+ usersign.data_len, verifyd, verify_len, sha1hash,
+ silc_query_attributes_verify, &verified);
+
+ if (verified) {
printformat_module("fe-common/silc", server, NULL,
MSGLEVEL_CRAP, SILCTXT_ATTR_USER_SIGN_VERIFIED);
} else {
printformat_module("fe-common/silc", server, NULL,
MSGLEVEL_CRAP, SILCTXT_ATTR_USER_SIGN_VERIFIED);
} else {
@@
-873,6
+880,7
@@
void silc_query_attributes_print(SILC_SERVER_REC *server,
SilcPKCSType type = 0;
unsigned char *verifyd;
SilcUInt32 verify_len;
SilcPKCSType type = 0;
unsigned char *verifyd;
SilcUInt32 verify_len;
+ SilcBool verified = FALSE;
if (!strcmp(serverpk.type, "silc-rsa"))
type = SILC_PKCS_SILC;
if (!strcmp(serverpk.type, "silc-rsa"))
type = SILC_PKCS_SILC;
@@
-887,11
+895,11
@@
void silc_query_attributes_print(SILC_SERVER_REC *server,
serverpk.data_len,
&public_key)) {
verifyd = silc_attribute_get_verify_data(attrs, TRUE, &verify_len);
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(public_key,
serversign.data,
+
serversign.data_len, verifyd, verify_len, sha1hash
,
+ silc_query_attributes_verify, &verified);
+
if (verified
) {
printformat_module("fe-common/silc", server, NULL,
MSGLEVEL_CRAP, SILCTXT_ATTR_SERVER_SIGN_VERIFIED);
} else {
printformat_module("fe-common/silc", server, NULL,
MSGLEVEL_CRAP, SILCTXT_ATTR_SERVER_SIGN_VERIFIED);
} else {