X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilccrypt%2Fsilcpkcs.c;h=21821257fe37114a1692dba24683174f72d778c5;hp=2f9699bb064bdeb51674a554f13b12f9c839d129;hb=a818c5b5411bbc4436d1c5f011236985c96bb787;hpb=7910ce2a5c55211a4ea09a52832c6ed32c0b64fd

diff --git a/lib/silccrypt/silcpkcs.c b/lib/silccrypt/silcpkcs.c
index 2f9699bb..21821257 100644
--- a/lib/silccrypt/silcpkcs.c
+++ b/lib/silccrypt/silcpkcs.c
@@ -204,28 +204,28 @@ char *silc_pkcs_get_supported(void)
 
 /* Returns the length of the key */
 
-uint32 silc_pkcs_get_key_len(SilcPKCS pkcs)
+SilcUInt32 silc_pkcs_get_key_len(SilcPKCS pkcs)
 {
   return pkcs->key_len;
 }
 
 /* Returns SILC style public key */
 
-unsigned char *silc_pkcs_get_public_key(SilcPKCS pkcs, uint32 *len)
+unsigned char *silc_pkcs_get_public_key(SilcPKCS pkcs, SilcUInt32 *len)
 {
   return pkcs->pkcs->get_public_key(pkcs->context, len);
 }
 
 /* Returns SILC style private key */
 
-unsigned char *silc_pkcs_get_private_key(SilcPKCS pkcs, uint32 *len)
+unsigned char *silc_pkcs_get_private_key(SilcPKCS pkcs, SilcUInt32 *len)
 {
   return pkcs->pkcs->get_private_key(pkcs->context, len);
 }
 
 /* Sets public key from SilcPublicKey. */
 
-uint32 silc_pkcs_public_key_set(SilcPKCS pkcs, SilcPublicKey public_key)
+SilcUInt32 silc_pkcs_public_key_set(SilcPKCS pkcs, SilcPublicKey public_key)
 {
   pkcs->key_len = pkcs->pkcs->set_public_key(pkcs->context, public_key->pk, 
 					     public_key->pk_len);
@@ -234,8 +234,8 @@ uint32 silc_pkcs_public_key_set(SilcPKCS pkcs, SilcPublicKey public_key)
 
 /* Sets public key from data. */
 
-uint32 silc_pkcs_public_key_data_set(SilcPKCS pkcs, unsigned char *pk,
-				     uint32 pk_len)
+SilcUInt32 silc_pkcs_public_key_data_set(SilcPKCS pkcs, unsigned char *pk,
+				     SilcUInt32 pk_len)
 {
   pkcs->key_len = pkcs->pkcs->set_public_key(pkcs->context, pk, pk_len);
   return pkcs->key_len;
@@ -252,31 +252,31 @@ int silc_pkcs_private_key_set(SilcPKCS pkcs, SilcPrivateKey private_key)
 /* Sets private key from data. */
 
 int silc_pkcs_private_key_data_set(SilcPKCS pkcs, unsigned char *prv,
-				   uint32 prv_len)
+				   SilcUInt32 prv_len)
 {
   return pkcs->pkcs->set_private_key(pkcs->context, prv, prv_len);
 }
 
 /* Encrypts */
 
-int silc_pkcs_encrypt(SilcPKCS pkcs, unsigned char *src, uint32 src_len,
-		      unsigned char *dst, uint32 *dst_len)
+int silc_pkcs_encrypt(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len,
+		      unsigned char *dst, SilcUInt32 *dst_len)
 {
   return pkcs->pkcs->encrypt(pkcs->context, src, src_len, dst, dst_len);
 }
 
 /* Decrypts */
 
-int silc_pkcs_decrypt(SilcPKCS pkcs, unsigned char *src, uint32 src_len,
-		      unsigned char *dst, uint32 *dst_len)
+int silc_pkcs_decrypt(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len,
+		      unsigned char *dst, SilcUInt32 *dst_len)
 {
   return pkcs->pkcs->decrypt(pkcs->context, src, src_len, dst, dst_len);
 }
 
 /* Generates signature */
 
-int silc_pkcs_sign(SilcPKCS pkcs, unsigned char *src, uint32 src_len,
-		   unsigned char *dst, uint32 *dst_len)
+int silc_pkcs_sign(SilcPKCS pkcs, unsigned char *src, SilcUInt32 src_len,
+		   unsigned char *dst, SilcUInt32 *dst_len)
 {
   return pkcs->pkcs->sign(pkcs->context, src, src_len, dst, dst_len);
 }
@@ -284,8 +284,8 @@ int silc_pkcs_sign(SilcPKCS pkcs, unsigned char *src, uint32 src_len,
 /* Verifies signature */
 
 int silc_pkcs_verify(SilcPKCS pkcs, unsigned char *signature, 
-		     uint32 signature_len, unsigned char *data, 
-		     uint32 data_len)
+		     SilcUInt32 signature_len, unsigned char *data, 
+		     SilcUInt32 data_len)
 {
   return pkcs->pkcs->verify(pkcs->context, signature, signature_len, 
 			    data, data_len);
@@ -294,11 +294,11 @@ int silc_pkcs_verify(SilcPKCS pkcs, unsigned char *signature,
 /* Generates signature with hash. The hash is signed. */
 
 int silc_pkcs_sign_with_hash(SilcPKCS pkcs, SilcHash hash,
-			     unsigned char *src, uint32 src_len,
-			     unsigned char *dst, uint32 *dst_len)
+			     unsigned char *src, SilcUInt32 src_len,
+			     unsigned char *dst, SilcUInt32 *dst_len)
 {
   unsigned char hashr[32];
-  uint32 hash_len;
+  SilcUInt32 hash_len;
   int ret;
 
   silc_hash_make(hash, src, src_len, hashr);
@@ -317,12 +317,12 @@ int silc_pkcs_sign_with_hash(SilcPKCS pkcs, SilcHash hash,
 
 int silc_pkcs_verify_with_hash(SilcPKCS pkcs, SilcHash hash, 
 			       unsigned char *signature, 
-			       uint32 signature_len, 
+			       SilcUInt32 signature_len, 
 			       unsigned char *data, 
-			       uint32 data_len)
+			       SilcUInt32 data_len)
 {
   unsigned char hashr[32];
-  uint32 hash_len;
+  SilcUInt32 hash_len;
   int ret;
 
   silc_hash_make(hash, data, data_len, hashr);
@@ -346,7 +346,7 @@ char *silc_pkcs_encode_identifier(char *username, char *host, char *realname,
 {
   SilcBuffer buf;
   char *identifier;
-  uint32 len, tlen = 0;
+  SilcUInt32 len, tlen = 0;
 
   if (!username || !host)
     return NULL;
@@ -503,7 +503,7 @@ void silc_pkcs_free_identifier(SilcPublicKeyIdentifier identifier)
 
 SilcPublicKey silc_pkcs_public_key_alloc(char *name, char *identifier,
 					 unsigned char *pk, 
-					 uint32 pk_len)
+					 SilcUInt32 pk_len)
 {
   SilcPublicKey public_key;
 
@@ -534,7 +534,7 @@ void silc_pkcs_public_key_free(SilcPublicKey public_key)
    duplicated. */
 
 SilcPrivateKey silc_pkcs_private_key_alloc(char *name, unsigned char *prv,
-					   uint32 prv_len)
+					   SilcUInt32 prv_len)
 {
   SilcPrivateKey private_key;
 
@@ -562,7 +562,7 @@ void silc_pkcs_private_key_free(SilcPrivateKey private_key)
    data. */
 
 unsigned char *
-silc_pkcs_public_key_encode(SilcPublicKey public_key, uint32 *len)
+silc_pkcs_public_key_encode(SilcPublicKey public_key, SilcUInt32 *len)
 {
   SilcBuffer buf;
   unsigned char *ret;
@@ -592,13 +592,13 @@ silc_pkcs_public_key_encode(SilcPublicKey public_key, uint32 *len)
 /* Encodes SILC style public key. Returns the encoded data. */
 
 unsigned char *
-silc_pkcs_public_key_data_encode(unsigned char *pk, uint32 pk_len,
+silc_pkcs_public_key_data_encode(unsigned char *pk, SilcUInt32 pk_len,
 				 char *pkcs, char *identifier, 
-				 uint32 *len)
+				 SilcUInt32 *len)
 {
   SilcBuffer buf;
   unsigned char *ret;
-  uint32 totlen;
+  SilcUInt32 totlen;
 
   totlen = 4 + 2 + strlen(pkcs) + 2 + strlen(identifier) + pk_len;
   buf = silc_buffer_alloc(totlen);
@@ -625,13 +625,13 @@ silc_pkcs_public_key_data_encode(unsigned char *pk, uint32 pk_len,
 /* Decodes SILC style public key. Returns TRUE if the decoding was
    successful. Allocates new public key as well. */
 
-int silc_pkcs_public_key_decode(unsigned char *data, uint32 data_len,
+int silc_pkcs_public_key_decode(unsigned char *data, SilcUInt32 data_len,
 				SilcPublicKey *public_key)
 {
   SilcBuffer buf;
   SilcPKCS alg;
-  uint16 pkcs_len, identifier_len;
-  uint32 totlen, key_len;
+  SilcUInt16 pkcs_len, identifier_len;
+  SilcUInt32 totlen, key_len;
   unsigned char *pkcs_name = NULL, *ident = NULL, *key_data = NULL;
   int ret;
 
@@ -745,11 +745,11 @@ bool silc_pkcs_public_key_compare(SilcPublicKey key1, SilcPublicKey key2)
 /* Encodes SILC private key from SilcPrivateKey. Returns the encoded data. */
 
 unsigned char *
-silc_pkcs_private_key_encode(SilcPrivateKey private_key, uint32 *len)
+silc_pkcs_private_key_encode(SilcPrivateKey private_key, SilcUInt32 *len)
 {
   SilcBuffer buf;
   unsigned char *ret;
-  uint32 totlen;
+  SilcUInt32 totlen;
 
   totlen = 2 + strlen(private_key->name) + private_key->prv_len;
   buf = silc_buffer_alloc(totlen);
@@ -774,12 +774,12 @@ silc_pkcs_private_key_encode(SilcPrivateKey private_key, uint32 *len)
 /* Encodes SILC private key. Returns the encoded data. */
 
 unsigned char *
-silc_pkcs_private_key_data_encode(unsigned char *prv, uint32 prv_len,
-				  char *pkcs, uint32 *len)
+silc_pkcs_private_key_data_encode(unsigned char *prv, SilcUInt32 prv_len,
+				  char *pkcs, SilcUInt32 *len)
 {
   SilcBuffer buf;
   unsigned char *ret;
-  uint32 totlen;
+  SilcUInt32 totlen;
 
   totlen = 2 + strlen(pkcs) + prv_len;
   buf = silc_buffer_alloc(totlen);
@@ -803,13 +803,13 @@ silc_pkcs_private_key_data_encode(unsigned char *prv, uint32 prv_len,
 /* Decodes SILC style public key. Returns TRUE if the decoding was
    successful. Allocates new private key as well. */
 
-int silc_pkcs_private_key_decode(unsigned char *data, uint32 data_len,
+int silc_pkcs_private_key_decode(unsigned char *data, SilcUInt32 data_len,
 				 SilcPrivateKey *private_key)
 {
   SilcBuffer buf;
   SilcPKCS alg;
-  uint16 pkcs_len;
-  uint32 key_len;
+  SilcUInt16 pkcs_len;
+  SilcUInt32 key_len;
   unsigned char *pkcs_name = NULL, *key_data = NULL;
   int ret;
 
@@ -876,11 +876,11 @@ int silc_pkcs_private_key_decode(unsigned char *data, uint32 data_len,
 
 static int silc_pkcs_save_public_key_internal(char *filename,
 					      unsigned char *data,
-					      uint32 data_len,
-					      uint32 encoding)
+					      SilcUInt32 data_len,
+					      SilcUInt32 encoding)
 {
   SilcBuffer buf;
-  uint32 len;
+  SilcUInt32 len;
 
   switch(encoding) {
   case SILC_PKCS_FILE_BIN:
@@ -915,10 +915,10 @@ static int silc_pkcs_save_public_key_internal(char *filename,
 /* Saves public key into file */
 
 int silc_pkcs_save_public_key(char *filename, SilcPublicKey public_key,
-			      uint32 encoding)
+			      SilcUInt32 encoding)
 {
   unsigned char *data;
-  uint32 data_len;
+  SilcUInt32 data_len;
 
   data = silc_pkcs_public_key_encode(public_key, &data_len);
   return silc_pkcs_save_public_key_internal(filename, data, data_len,
@@ -928,8 +928,8 @@ int silc_pkcs_save_public_key(char *filename, SilcPublicKey public_key,
 /* Saves public key into file */
 
 int silc_pkcs_save_public_key_data(char *filename, unsigned char *data,
-				   uint32 data_len,
-				   uint32 encoding)
+				   SilcUInt32 data_len,
+				   SilcUInt32 encoding)
 {
   return silc_pkcs_save_public_key_internal(filename, data, data_len,
 					    encoding);
@@ -939,11 +939,11 @@ int silc_pkcs_save_public_key_data(char *filename, unsigned char *data,
 
 static int silc_pkcs_save_private_key_internal(char *filename,
 					       unsigned char *data,
-					       uint32 data_len,
-					       uint32 encoding)
+					       SilcUInt32 data_len,
+					       SilcUInt32 encoding)
 {
   SilcBuffer buf;
-  uint32 len;
+  SilcUInt32 len;
 
   switch(encoding) {
   case SILC_PKCS_FILE_BIN:
@@ -980,10 +980,10 @@ static int silc_pkcs_save_private_key_internal(char *filename,
 
 int silc_pkcs_save_private_key(char *filename, SilcPrivateKey private_key, 
 			       unsigned char *passphrase,
-			       uint32 encoding)
+			       SilcUInt32 encoding)
 {
   unsigned char *data;
-  uint32 data_len;
+  SilcUInt32 data_len;
 
   data = silc_pkcs_private_key_encode(private_key, &data_len);
   return silc_pkcs_save_private_key_internal(filename, data, data_len,
@@ -994,9 +994,9 @@ int silc_pkcs_save_private_key(char *filename, SilcPrivateKey private_key,
 /* XXX The buffer should be encrypted if passphrase is provided. */
 
 int silc_pkcs_save_private_key_data(char *filename, unsigned char *data, 
-				    uint32 data_len,
+				    SilcUInt32 data_len,
 				    unsigned char *passphrase,
-				    uint32 encoding)
+				    SilcUInt32 encoding)
 {
   return silc_pkcs_save_private_key_internal(filename, data, data_len,
 					     encoding);
@@ -1006,10 +1006,10 @@ int silc_pkcs_save_private_key_data(char *filename, unsigned char *data,
    is loading was successful. */
 
 int silc_pkcs_load_public_key(char *filename, SilcPublicKey *public_key,
-			      uint32 encoding)
+			      SilcUInt32 encoding)
 {
   unsigned char *cp, *old, *data, byte;
-  uint32 i, data_len, len;
+  SilcUInt32 i, data_len, len;
 
   old = data = silc_file_readfile(filename, &data_len);
   if (!data)
@@ -1063,10 +1063,10 @@ int silc_pkcs_load_public_key(char *filename, SilcPublicKey *public_key,
 /* XXX Should support encrypted private key files */
 
 int silc_pkcs_load_private_key(char *filename, SilcPrivateKey *private_key,
-			       uint32 encoding)
+			       SilcUInt32 encoding)
 {
   unsigned char *cp, *old, *data, byte;
-  uint32 i, data_len, len;
+  SilcUInt32 i, data_len, len;
 
   old = data = silc_file_readfile(filename, &data_len);
   if (!data)