Attachment #556940 for bug #672390

View | Details | Raw Unified | Return to bug 672390
Collapse All | Expand All

Lines 15722-15730 Link Here

(-)configure~ (-3 / +3 lines)
15722	CFLAGS=$SAVE_CFLAGS	15722	CFLAGS=$SAVE_CFLAGS
15723	LDFLAGS=$SAVE_LDFLAGS	15723	LDFLAGS=$SAVE_LDFLAGS
15724		15724
15725	if test "x$have_crypto" = "xno"; then	15725	#if test "x$have_crypto" = "xno"; then
15726	as_fn_error $? "BLOCKDEV CRYPTO support requested but header or library not found" "$LINENO" 5	15726	# as_fn_error $? "BLOCKDEV CRYPTO support requested but header or library not found" "$LINENO" 5
15727	fi	15727	#fi
15728		15728
15729		15729
15730	# Internationalization	15730	# Internationalization

Lines 1516-1526 Link Here

(-)src/udiskslinuxblock.c~ (-2 / +2 lines)
1516	static gchar *	1516	static gchar *
1517	make_block_luksname (UDisksBlock block, GError *error)	1517	make_block_luksname (UDisksBlock block, GError *error)
1518	{	1518	{
1519	gchar *uuid = bd_crypto_luks_uuid (udisks_block_get_device (block), error);	1519	/* gchar *uuid = bd_crypto_luks_uuid (udisks_block_get_device (block), error);
1520		1520
1521	if (uuid)	1521	if (uuid)
1522	return g_strdup_printf ("luks-%s", uuid);	1522	return g_strdup_printf ("luks-%s", uuid);
1523	else	1523	else */
1524	return NULL;	1524	return NULL;
1525	}	1525	}
1526		1526




 */

#include <glib.h>
#include <blockdev/crypto.h>

#include "udisksthreadedjob.h"
#include "udiskslinuxencryptedhelpers.h"

  LuksJobData *data = (LuksJobData*) user_data;

  /* device, cipher, key_size, passphrase, key_file, min_entropy, error */
  return NULL;
                                     (const guint8*) data->passphrase->str, data->passphrase->len, 0,
                                     error);
}

gboolean luks_open_job_func (UDisksThreadedJob  *job,

  LuksJobData *data = (LuksJobData*) user_data;

  /* device, name, passphrase, key_file, read_only, error */
  return NULL;
                                   (const guint8*) data->passphrase->str, data->passphrase->len, data->read_only,
                                   error);
}

gboolean luks_close_job_func (UDisksThreadedJob  *job,

                    GError            **error)
{
  LuksJobData *data = (LuksJobData*) user_data;
  return NULL;
}

gboolean luks_change_key_job_func (UDisksThreadedJob  *job,

                          GError            **error)
{
  LuksJobData *data = (LuksJobData*) user_data;
  return NULL;
                                         (const guint8*) data->passphrase->str, data->passphrase->len,
                                         (const guint8*) data->new_passphrase->str, data->new_passphrase->len,
                                         error);
}

Lines 24-30 Link Here

(-)src/udiskslinuxencryptedhelpers.h~ (-1 lines)
24	#define __UDISKS_LINUX_ENCRYPTED_HEPLERS_H__	24	#define __UDISKS_LINUX_ENCRYPTED_HEPLERS_H__
25		25
26	#include <glib.h>	26	#include <glib.h>
27	#include <blockdev/crypto.h>
28		27
29	#include "udisksthreadedjob.h"	28	#include "udisksthreadedjob.h"
30		29

Return to bug 672390

Lines 21-27 Link Here

(-)src/udiskslinuxencryptedhelpers.c~ (-12 / +4 lines)
21	*/	21	*/
22		22
23	#include <glib.h>	23	#include <glib.h>
24	#include <blockdev/crypto.h>
25		24
26	#include "udisksthreadedjob.h"	25	#include "udisksthreadedjob.h"
27	#include "udiskslinuxencryptedhelpers.h"	26	#include "udiskslinuxencryptedhelpers.h"
Lines 34-42 Link Here
34	LuksJobData data = (LuksJobData) user_data;	33	LuksJobData data = (LuksJobData) user_data;
35		34
36	/* device, cipher, key_size, passphrase, key_file, min_entropy, error */	35	/* device, cipher, key_size, passphrase, key_file, min_entropy, error */
37	return bd_crypto_luks_format_blob (data->device, NULL, 0,	36	return NULL;
38	(const guint8*) data->passphrase->str, data->passphrase->len, 0,
39	error);
40	}	37	}
41		38
42	gboolean luks_open_job_func (UDisksThreadedJob *job,	39	gboolean luks_open_job_func (UDisksThreadedJob *job,
Lines 47-55 Link Here
47	LuksJobData data = (LuksJobData) user_data;	44	LuksJobData data = (LuksJobData) user_data;
48		45
49	/* device, name, passphrase, key_file, read_only, error */	46	/* device, name, passphrase, key_file, read_only, error */
50	return bd_crypto_luks_open_blob (data->device, data->map_name,	47	return NULL;
51	(const guint8*) data->passphrase->str, data->passphrase->len, data->read_only,
52	error);
53	}	48	}
54		49
55	gboolean luks_close_job_func (UDisksThreadedJob *job,	50	gboolean luks_close_job_func (UDisksThreadedJob *job,
Lines 58-64 Link Here
58	GError **error)	53	GError **error)
59	{	54	{
60	LuksJobData data = (LuksJobData) user_data;	55	LuksJobData data = (LuksJobData) user_data;
61	return bd_crypto_luks_close (data->map_name, error);	56	return NULL;
62	}	57	}
63		58
64	gboolean luks_change_key_job_func (UDisksThreadedJob *job,	59	gboolean luks_change_key_job_func (UDisksThreadedJob *job,
Lines 67-74 Link Here
67	GError **error)	62	GError **error)
68	{	63	{
69	LuksJobData data = (LuksJobData) user_data;	64	LuksJobData data = (LuksJobData) user_data;
70	return bd_crypto_luks_change_key_blob (data->device,	65	return NULL;
71	(const guint8*) data->passphrase->str, data->passphrase->len,
72	(const guint8*) data->new_passphrase->str, data->new_passphrase->len,
73	error);
74	}	66	}