[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsdecrypt.c,1.20,1.21

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31691/ntfsprogs

Modified Files:
	ntfsdecrypt.c 
Log Message:
Fix compilation and warnings in ntfsdecrypt.c on OSX/gcc4.0.1.  The
compilation failure was because we use strnlen() which is gnu
specific and not present on my current version of OSX so ntfsdecrypt
now provides own version if it is not present on system.  (Anton)


Index: ntfsdecrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdecrypt.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ntfsdecrypt.c	7 Oct 2005 14:10:57 -0000	1.20
+++ ntfsdecrypt.c	15 Oct 2005 22:30:20 -0000	1.21
@@ -368,7 +368,8 @@ static void ntfs_crypto_deinit(void)
 static ntfs_rsa_private_key ntfs_rsa_private_key_import_from_gnutls(
 		gnutls_x509_privkey_t priv_key)
 {
-	int i, j, tmp_size;
+	int i, j;
+	size_t tmp_size;
 	gnutls_datum_t rd[6];
 	gcry_mpi_t rm[6];
 	gcry_sexp_t rsa_key;
@@ -577,6 +578,21 @@ static inline void ntfs_buffer_reverse(u
 	}
 }
 
+#ifndef HAVE_STRNLEN
+/**             
+ *  * strnlen - strnlen is a gnu extension so emulate it if not present
+ *   */     
+static size_t strnlen(const char *s, size_t maxlen)
+{       
+	const char *p, *end;
+
+	/* Look for a '\0' character. */
+	for (p = s, end = s + maxlen; p < end && *p; p++)
+		;
+	return p - s;
+}
+#endif /* ! HAVE_STRNLEN */
+
 /**
  * ntfs_raw_fek_decrypt -
  *
@@ -648,7 +664,7 @@ static unsigned ntfs_raw_fek_decrypt(u8 
 	 * Finally, remove the PKCS#1 padding and return the size of the
 	 * decrypted FEK.
 	 */
-	padding = strnlen(fek, size) + 1;
+	padding = strnlen((char *)fek, size) + 1;
 	if (padding > size) {
 		fprintf(stderr, "Failed to remove PKCS#1 padding from "
 				"decrypted file encryption key.\n");
@@ -669,8 +685,8 @@ static unsigned ntfs_raw_fek_decrypt(u8 
 static gcry_error_t ntfs_desx_key_expand(const u8 *src, u32 *des_key,
 		u64 *out_whitening, u64 *in_whitening)
 {
-	static const u8 *salt1 = "Dan Simon  ";
-	static const u8 *salt2 = "Scott Field";
+	static const u8 *salt1 = (const u8*)"Dan Simon  ";
+	static const u8 *salt2 = (const u8*)"Scott Field";
 	static const int salt_len = 12;
 	gcry_md_hd_t hd1, hd2;
 	u32 *md;
@@ -1107,7 +1123,7 @@ static int ntfs_fek_decrypt_sector(ntfs_
 static int ntfs_cat_decrypt(ntfs_inode *inode, ntfs_fek *fek)
 {
 	int bufsize = 512;
-	char *buffer;
+	unsigned char *buffer;
 	ntfs_attr *attr;
 	s64 bytes_read, written, offset, total;
 	s64 old_data_size, old_initialized_size;
@@ -1176,12 +1192,14 @@ static int ntfs_cat_decrypt(ntfs_inode *
  */
 int main(int argc, char *argv[])
 {
-	u8 *pfx_buf, *password;
+	u8 *pfx_buf;
+	char *password;
 	ntfs_rsa_private_key rsa_key;
 	ntfs_volume *vol;
 	ntfs_inode *inode;
 	ntfs_fek *fek;
-	int pfx_size, res;
+	unsigned pfx_size;
+	int res;
 
 	if (!parse_options(argc, argv))
 		return 1;