updates.

[silc.git] / lib / silcske / silcske.c

diff --git a/lib/silcske/silcske.c b/lib/silcske/silcske.c
index bc84849fdea90740a5597a0b0029f48380c07492..7a7f6b6983a5fcdb2e673e8580da9d3ab71908b0 100644 (file)
--- a/lib/silcske/silcske.c
+++ b/lib/silcske/silcske.c
@@ -353,9 +353,8 @@ SilcSKEStatus silc_ske_initiator_finish(SilcSKE ske,
   /* Verify signature */
   silc_pkcs_public_key_data_set(ske->prop->pkcs, public_key->pk, 
                                public_key->pk_len);
-  if (ske->prop->pkcs->pkcs->verify(ske->prop->pkcs->context,
-                                   payload->sign_data, payload->sign_len,
-                                   hash, hash_len) == FALSE) {
+  if (silc_pkcs_verify(ske->prop->pkcs, payload->sign_data, 
+                      payload->sign_len, hash, hash_len) == FALSE) {
 
     SILC_LOG_DEBUG(("Signature don't match"));
 
@@ -658,9 +657,7 @@ SilcSKEStatus silc_ske_responder_finish(SilcSKE ske,
   /* Sign the hash value */
   silc_pkcs_private_key_data_set(ske->prop->pkcs, private_key->prv, 
                                 private_key->prv_len);
-  ske->prop->pkcs->pkcs->sign(ske->prop->pkcs->context,
-                             hash, hash_len,
-                             sign, &sign_len);
+  silc_pkcs_sign(ske->prop->pkcs, hash, hash_len, sign, &sign_len);
   ske->ke2_payload->sign_data = silc_calloc(sign_len, sizeof(unsigned char));
   memcpy(ske->ke2_payload->sign_data, sign, sign_len);
   memset(sign, 0, sizeof(sign));
@@ -1161,9 +1158,9 @@ SilcSKEStatus silc_ske_make_hash(SilcSKE ske,
 
   SILC_LOG_DEBUG(("Start"));
 
-  e = silc_mp_mp2bin(&ske->ke1_payload->e, &e_len);
-  f = silc_mp_mp2bin(&ske->ke2_payload->f, &f_len);
-  KEY = silc_mp_mp2bin(ske->KEY, &KEY_len);
+  e = silc_mp_mp2bin(&ske->ke1_payload->e, 0, &e_len);
+  f = silc_mp_mp2bin(&ske->ke2_payload->f, 0, &f_len);
+  KEY = silc_mp_mp2bin(ske->KEY, 0, &KEY_len);
 
   buf = silc_buffer_alloc(ske->start_payload_copy->len + 
                          ske->pk_len + e_len + f_len + KEY_len);
@@ -1226,7 +1223,7 @@ SilcSKEStatus silc_ske_process_key_material(SilcSKE ske,
   SILC_LOG_DEBUG(("Start"));
 
   /* Encode KEY to binary data */
-  tmpbuf = silc_mp_mp2bin(ske->KEY, &klen);
+  tmpbuf = silc_mp_mp2bin(ske->KEY, 0, &klen);
 
   buf = silc_buffer_alloc(1 + klen + hash_len);
   silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf));