82b9cf
import cryptsetup-1.7.4-3.el7_4.1
@@ -0,0 +1 @@
|
|
1
|
+
1f06d268aee0adff931a39fe6709af7804e4f4f6 SOURCES/cryptsetup-1.7.4.tar.xz
|
@@ -0,0 +1 @@
|
|
1
|
+
SOURCES/cryptsetup-1.7.4.tar.xz
|
@@ -1,5 +0,0 @@
|
|
1
|
-
The master branch has no content
|
2
|
-
|
3
|
-
Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6
|
4
|
-
|
5
|
-
If you find this file in a distro specific branch, it means that no content has been checked in yet
|
@@ -0,0 +1,35 @@
|
|
1
|
+
From 3c2135b36bbc52d052e4ced7c94dc4981eb07a53 Mon Sep 17 00:00:00 2001
|
2
|
+
From: Milan Broz <gmazyland@gmail.com>
|
3
|
+
Date: Fri, 21 Apr 2017 08:16:14 +0200
|
4
|
+
Subject: [PATCH] Fix luksFormat if running in FIPS mode on recent kernel.
|
5
|
+
|
6
|
+
Recently introduced check for weak keys for XTS mode makes
|
7
|
+
zeroed key for algorithm check unusable.
|
8
|
+
|
9
|
+
Use random key for the test instead.
|
10
|
+
---
|
11
|
+
lib/luks1/keymanage.c | 8 +++++---
|
12
|
+
1 file changed, 5 insertions(+), 3 deletions(-)
|
13
|
+
|
14
|
+
diff --git a/lib/luks1/keymanage.c b/lib/luks1/keymanage.c
|
15
|
+
index b700bab..5b1421b 100644
|
16
|
+
--- a/lib/luks1/keymanage.c
|
17
|
+
+++ b/lib/luks1/keymanage.c
|
18
|
+
@@ -631,9 +631,11 @@ static int LUKS_check_cipher(struct luks_phdr *hdr, struct crypt_device *ctx)
|
19
|
+
if (!empty_key)
|
20
|
+
return -ENOMEM;
|
21
|
+
|
22
|
+
- r = LUKS_decrypt_from_storage(buf, sizeof(buf),
|
23
|
+
- hdr->cipherName, hdr->cipherMode,
|
24
|
+
- empty_key, 0, ctx);
|
25
|
+
+ /* No need to get KEY quality random but it must avoid known weak keys. */
|
26
|
+
+ r = crypt_random_get(ctx, empty_key->key, empty_key->keylength, CRYPT_RND_NORMAL);
|
27
|
+
+ if (!r)
|
28
|
+
+ r = LUKS_decrypt_from_storage(buf, sizeof(buf), hdr->cipherName,
|
29
|
+
+ hdr->cipherMode, empty_key, 0, ctx);
|
30
|
+
|
31
|
+
crypt_free_volume_key(empty_key);
|
32
|
+
crypt_memzero(buf, sizeof(buf));
|
33
|
+
--
|
34
|
+
2.7.4
|
35
|
+
|
@@ -0,0 +1,376 @@
|
|
1
|
+
From a117f431179a2747f2b1d5293f43d9e198f1bac9 Mon Sep 17 00:00:00 2001
|
2
|
+
From: Ondrej Kozina <okozina@redhat.com>
|
3
|
+
Date: Mon, 30 Nov 2015 16:44:15 +0100
|
4
|
+
Subject: [PATCH] Fix access to unaligned hidden TrueCrypt header.
|
5
|
+
|
6
|
+
backport all changes needed to fix unaligned access
|
7
|
+
to hidden TrueCrypt hedaer.
|
8
|
+
---
|
9
|
+
lib/internal.h | 7 ++-
|
10
|
+
lib/luks1/keymanage.c | 6 +-
|
11
|
+
lib/tcrypt/tcrypt.c | 24 ++++----
|
12
|
+
lib/utils.c | 155 +++++++++++++++++++++++++++++++++++++++++++-------
|
13
|
+
4 files changed, 152 insertions(+), 40 deletions(-)
|
14
|
+
|
15
|
+
diff --git a/lib/internal.h b/lib/internal.h
|
16
|
+
index 382a600..f1525f2 100644
|
17
|
+
--- a/lib/internal.h
|
18
|
+
+++ b/lib/internal.h
|
19
|
+
@@ -101,9 +101,12 @@ char *crypt_get_partition_device(const char *dev_path, uint64_t offset, uint64_t
|
20
|
+
char *crypt_get_base_device(const char *dev_path);
|
21
|
+
uint64_t crypt_dev_partition_offset(const char *dev_path);
|
22
|
+
|
23
|
+
+ssize_t write_buffer(int fd, const void *buf, size_t count);
|
24
|
+
+ssize_t read_buffer(int fd, void *buf, size_t count);
|
25
|
+
ssize_t write_blockwise(int fd, int bsize, void *buf, size_t count);
|
26
|
+
-ssize_t read_blockwise(int fd, int bsize, void *_buf, size_t count);
|
27
|
+
-ssize_t write_lseek_blockwise(int fd, int bsize, char *buf, size_t count, off_t offset);
|
28
|
+
+ssize_t read_blockwise(int fd, int bsize, void *buf, size_t count);
|
29
|
+
+ssize_t write_lseek_blockwise(int fd, int bsize, void *buf, size_t count, off_t offset);
|
30
|
+
+ssize_t read_lseek_blockwise(int fd, int bsize, void *buf, size_t count, off_t offset);
|
31
|
+
|
32
|
+
unsigned crypt_getpagesize(void);
|
33
|
+
int init_crypto(struct crypt_device *ctx);
|
34
|
+
diff --git a/lib/luks1/keymanage.c b/lib/luks1/keymanage.c
|
35
|
+
index 23e3fe2..b193ee9 100644
|
36
|
+
--- a/lib/luks1/keymanage.c
|
37
|
+
+++ b/lib/luks1/keymanage.c
|
38
|
+
@@ -201,7 +201,7 @@ int LUKS_hdr_backup(const char *backup_file, struct crypt_device *ctx)
|
39
|
+
r = -EINVAL;
|
40
|
+
goto out;
|
41
|
+
}
|
42
|
+
- if (write(devfd, buffer, buffer_size) < buffer_size) {
|
43
|
+
+ if (write_buffer(devfd, buffer, buffer_size) < buffer_size) {
|
44
|
+
log_err(ctx, _("Cannot write header backup file %s.\n"), backup_file);
|
45
|
+
r = -EIO;
|
46
|
+
goto out;
|
47
|
+
@@ -253,7 +253,7 @@ int LUKS_hdr_restore(
|
48
|
+
goto out;
|
49
|
+
}
|
50
|
+
|
51
|
+
- if (read(devfd, buffer, buffer_size) < buffer_size) {
|
52
|
+
+ if (read_buffer(devfd, buffer, buffer_size) < buffer_size) {
|
53
|
+
log_err(ctx, _("Cannot read header backup file %s.\n"), backup_file);
|
54
|
+
r = -EIO;
|
55
|
+
goto out;
|
56
|
+
@@ -498,7 +498,7 @@ int LUKS_read_phdr_backup(const char *backup_file,
|
57
|
+
return -ENOENT;
|
58
|
+
}
|
59
|
+
|
60
|
+
- if (read(devfd, hdr, hdr_size) < hdr_size)
|
61
|
+
+ if (read_buffer(devfd, hdr, hdr_size) < hdr_size)
|
62
|
+
r = -EIO;
|
63
|
+
else {
|
64
|
+
LUKS_fix_header_compatible(hdr);
|
65
|
+
diff --git a/lib/tcrypt/tcrypt.c b/lib/tcrypt/tcrypt.c
|
66
|
+
index 45154ed..9ff7157 100644
|
67
|
+
--- a/lib/tcrypt/tcrypt.c
|
68
|
+
+++ b/lib/tcrypt/tcrypt.c
|
69
|
+
@@ -469,8 +469,7 @@ static int TCRYPT_pool_keyfile(struct crypt_device *cd,
|
70
|
+
return -EIO;
|
71
|
+
}
|
72
|
+
|
73
|
+
- /* FIXME: add while */
|
74
|
+
- data_size = read(fd, data, TCRYPT_KEYFILE_LEN);
|
75
|
+
+ data_size = read_buffer(fd, data, TCRYPT_KEYFILE_LEN);
|
76
|
+
close(fd);
|
77
|
+
if (data_size < 0) {
|
78
|
+
log_err(cd, _("Error reading keyfile %s.\n"), keyfile);
|
79
|
+
@@ -628,27 +627,26 @@ int TCRYPT_read_phdr(struct crypt_device *cd,
|
80
|
+
|
81
|
+
r = -EIO;
|
82
|
+
if (params->flags & CRYPT_TCRYPT_SYSTEM_HEADER) {
|
83
|
+
- if (lseek(devfd, TCRYPT_HDR_SYSTEM_OFFSET, SEEK_SET) >= 0 &&
|
84
|
+
- read_blockwise(devfd, bs, hdr, hdr_size) == hdr_size) {
|
85
|
+
+ if (read_lseek_blockwise(devfd, bs, hdr, hdr_size,
|
86
|
+
+ TCRYPT_HDR_SYSTEM_OFFSET) == hdr_size) {
|
87
|
+
r = TCRYPT_init_hdr(cd, hdr, params);
|
88
|
+
}
|
89
|
+
} else if (params->flags & CRYPT_TCRYPT_HIDDEN_HEADER) {
|
90
|
+
if (params->flags & CRYPT_TCRYPT_BACKUP_HEADER) {
|
91
|
+
- if (lseek(devfd, TCRYPT_HDR_HIDDEN_OFFSET_BCK, SEEK_END) >= 0 &&
|
92
|
+
- read_blockwise(devfd, bs, hdr, hdr_size) == hdr_size)
|
93
|
+
+ if (read_lseek_blockwise(devfd, bs, hdr, hdr_size,
|
94
|
+
+ TCRYPT_HDR_HIDDEN_OFFSET_BCK) == hdr_size)
|
95
|
+
r = TCRYPT_init_hdr(cd, hdr, params);
|
96
|
+
} else {
|
97
|
+
- if (lseek(devfd, TCRYPT_HDR_HIDDEN_OFFSET, SEEK_SET) >= 0 &&
|
98
|
+
- read_blockwise(devfd, bs, hdr, hdr_size) == hdr_size)
|
99
|
+
+ if (read_lseek_blockwise(devfd, bs, hdr, hdr_size,
|
100
|
+
+ TCRYPT_HDR_HIDDEN_OFFSET) == hdr_size)
|
101
|
+
r = TCRYPT_init_hdr(cd, hdr, params);
|
102
|
+
- if (r &&
|
103
|
+
- lseek(devfd, TCRYPT_HDR_HIDDEN_OFFSET_OLD, SEEK_END) >= 0 &&
|
104
|
+
- read_blockwise(devfd, bs, hdr, hdr_size) == hdr_size)
|
105
|
+
+ if (r && read_lseek_blockwise(devfd, bs, hdr, hdr_size,
|
106
|
+
+ TCRYPT_HDR_HIDDEN_OFFSET_OLD) == hdr_size)
|
107
|
+
r = TCRYPT_init_hdr(cd, hdr, params);
|
108
|
+
}
|
109
|
+
} else if (params->flags & CRYPT_TCRYPT_BACKUP_HEADER) {
|
110
|
+
- if (lseek(devfd, TCRYPT_HDR_OFFSET_BCK, SEEK_END) >= 0 &&
|
111
|
+
- read_blockwise(devfd, bs, hdr, hdr_size) == hdr_size)
|
112
|
+
+ if (read_lseek_blockwise(devfd, bs, hdr, hdr_size,
|
113
|
+
+ TCRYPT_HDR_OFFSET_BCK) == hdr_size)
|
114
|
+
r = TCRYPT_init_hdr(cd, hdr, params);
|
115
|
+
} else if (read_blockwise(devfd, bs, hdr, hdr_size) == hdr_size)
|
116
|
+
r = TCRYPT_init_hdr(cd, hdr, params);
|
117
|
+
diff --git a/lib/utils.c b/lib/utils.c
|
118
|
+
index 2dcf753..802ba55 100644
|
119
|
+
--- a/lib/utils.c
|
120
|
+
+++ b/lib/utils.c
|
121
|
+
@@ -56,22 +56,70 @@ static void *aligned_malloc(void **base, int size, int alignment)
|
122
|
+
/* Credits go to Michal's padlock patches for this alignment code */
|
123
|
+
char *ptr;
|
124
|
+
|
125
|
+
- ptr = malloc(size + alignment);
|
126
|
+
- if(ptr == NULL) return NULL;
|
127
|
+
+ ptr = malloc(size + alignment);
|
128
|
+
+ if (!ptr)
|
129
|
+
+ return NULL;
|
130
|
+
|
131
|
+
*base = ptr;
|
132
|
+
- if(alignment > 1 && ((long)ptr & (alignment - 1))) {
|
133
|
+
+ if (alignment > 1 && ((long)ptr & (alignment - 1)))
|
134
|
+
ptr += alignment - ((long)(ptr) & (alignment - 1));
|
135
|
+
- }
|
136
|
+
+
|
137
|
+
return ptr;
|
138
|
+
#endif
|
139
|
+
}
|
140
|
+
|
141
|
+
+ssize_t read_buffer(int fd, void *buf, size_t count)
|
142
|
+
+{
|
143
|
+
+ size_t read_size = 0;
|
144
|
+
+ ssize_t r;
|
145
|
+
+
|
146
|
+
+ if (fd < 0 || !buf)
|
147
|
+
+ return -EINVAL;
|
148
|
+
+
|
149
|
+
+ do {
|
150
|
+
+ r = read(fd, buf, count - read_size);
|
151
|
+
+ if (r == -1 && errno != EINTR)
|
152
|
+
+ return r;
|
153
|
+
+ if (r == 0)
|
154
|
+
+ return (ssize_t)read_size;
|
155
|
+
+ if (r > 0) {
|
156
|
+
+ read_size += (size_t)r;
|
157
|
+
+ buf = (uint8_t*)buf + r;
|
158
|
+
+ }
|
159
|
+
+ } while (read_size != count);
|
160
|
+
+
|
161
|
+
+ return (ssize_t)count;
|
162
|
+
+}
|
163
|
+
+
|
164
|
+
+ssize_t write_buffer(int fd, const void *buf, size_t count)
|
165
|
+
+{
|
166
|
+
+ size_t write_size = 0;
|
167
|
+
+ ssize_t w;
|
168
|
+
+
|
169
|
+
+ if (fd < 0 || !buf || !count)
|
170
|
+
+ return -EINVAL;
|
171
|
+
+
|
172
|
+
+ do {
|
173
|
+
+ w = write(fd, buf, count - write_size);
|
174
|
+
+ if (w < 0 && errno != EINTR)
|
175
|
+
+ return w;
|
176
|
+
+ if (w == 0)
|
177
|
+
+ return (ssize_t)write_size;
|
178
|
+
+ if (w > 0) {
|
179
|
+
+ write_size += (size_t) w;
|
180
|
+
+ buf = (const uint8_t*)buf + w;
|
181
|
+
+ }
|
182
|
+
+ } while (write_size != count);
|
183
|
+
+
|
184
|
+
+ return (ssize_t)write_size;
|
185
|
+
+}
|
186
|
+
+
|
187
|
+
ssize_t write_blockwise(int fd, int bsize, void *orig_buf, size_t count)
|
188
|
+
{
|
189
|
+
void *hangover_buf, *hangover_buf_base = NULL;
|
190
|
+
void *buf, *buf_base = NULL;
|
191
|
+
- int r, hangover, solid, alignment;
|
192
|
+
+ int r, alignment;
|
193
|
+
+ size_t hangover, solid;
|
194
|
+
ssize_t ret = -1;
|
195
|
+
|
196
|
+
if (fd == -1 || !orig_buf || bsize <= 0)
|
197
|
+
@@ -89,17 +137,19 @@ ssize_t write_blockwise(int fd, int bsize, void *orig_buf, size_t count)
|
198
|
+
} else
|
199
|
+
buf = orig_buf;
|
200
|
+
|
201
|
+
- r = write(fd, buf, solid);
|
202
|
+
- if (r < 0 || r != solid)
|
203
|
+
- goto out;
|
204
|
+
+ if (solid) {
|
205
|
+
+ r = write_buffer(fd, buf, solid);
|
206
|
+
+ if (r < 0 || r != (ssize_t)solid)
|
207
|
+
+ goto out;
|
208
|
+
+ }
|
209
|
+
|
210
|
+
if (hangover) {
|
211
|
+
hangover_buf = aligned_malloc(&hangover_buf_base, bsize, alignment);
|
212
|
+
if (!hangover_buf)
|
213
|
+
goto out;
|
214
|
+
|
215
|
+
- r = read(fd, hangover_buf, bsize);
|
216
|
+
- if (r < 0 || r < hangover)
|
217
|
+
+ r = read_buffer(fd, hangover_buf, bsize);
|
218
|
+
+ if (r < 0 || r < (ssize_t)hangover)
|
219
|
+
goto out;
|
220
|
+
|
221
|
+
if (r < bsize)
|
222
|
+
@@ -110,8 +160,8 @@ ssize_t write_blockwise(int fd, int bsize, void *orig_buf, size_t count)
|
223
|
+
|
224
|
+
memcpy(hangover_buf, (char*)buf + solid, hangover);
|
225
|
+
|
226
|
+
- r = write(fd, hangover_buf, bsize);
|
227
|
+
- if (r < 0 || r < hangover)
|
228
|
+
+ r = write_buffer(fd, hangover_buf, bsize);
|
229
|
+
+ if (r < 0 || r < (ssize_t)hangover)
|
230
|
+
goto out;
|
231
|
+
}
|
232
|
+
ret = count;
|
233
|
+
@@ -122,10 +172,12 @@ out:
|
234
|
+
return ret;
|
235
|
+
}
|
236
|
+
|
237
|
+
-ssize_t read_blockwise(int fd, int bsize, void *orig_buf, size_t count) {
|
238
|
+
+ssize_t read_blockwise(int fd, int bsize, void *orig_buf, size_t count)
|
239
|
+
+{
|
240
|
+
void *hangover_buf, *hangover_buf_base = NULL;
|
241
|
+
void *buf, *buf_base = NULL;
|
242
|
+
- int r, hangover, solid, alignment;
|
243
|
+
+ int r, alignment;
|
244
|
+
+ size_t hangover, solid;
|
245
|
+
ssize_t ret = -1;
|
246
|
+
|
247
|
+
if (fd == -1 || !orig_buf || bsize <= 0)
|
248
|
+
@@ -142,16 +194,16 @@ ssize_t read_blockwise(int fd, int bsize, void *orig_buf, size_t count) {
|
249
|
+
} else
|
250
|
+
buf = orig_buf;
|
251
|
+
|
252
|
+
- r = read(fd, buf, solid);
|
253
|
+
- if(r < 0 || r != solid)
|
254
|
+
+ r = read_buffer(fd, buf, solid);
|
255
|
+
+ if (r < 0 || r != (ssize_t)solid)
|
256
|
+
goto out;
|
257
|
+
|
258
|
+
if (hangover) {
|
259
|
+
hangover_buf = aligned_malloc(&hangover_buf_base, bsize, alignment);
|
260
|
+
if (!hangover_buf)
|
261
|
+
goto out;
|
262
|
+
- r = read(fd, hangover_buf, bsize);
|
263
|
+
- if (r < 0 || r < hangover)
|
264
|
+
+ r = read_buffer(fd, hangover_buf, bsize);
|
265
|
+
+ if (r < 0 || r < (ssize_t)hangover)
|
266
|
+
goto out;
|
267
|
+
|
268
|
+
memcpy((char *)buf + solid, hangover_buf, hangover);
|
269
|
+
@@ -172,7 +224,8 @@ out:
|
270
|
+
* is implicitly included in the read/write offset, which can not be set to non-aligned
|
271
|
+
* boundaries. Hence, we combine llseek with write.
|
272
|
+
*/
|
273
|
+
-ssize_t write_lseek_blockwise(int fd, int bsize, char *buf, size_t count, off_t offset) {
|
274
|
+
+ssize_t write_lseek_blockwise(int fd, int bsize, void *buf, size_t count, off_t offset)
|
275
|
+
+{
|
276
|
+
char *frontPadBuf;
|
277
|
+
void *frontPadBuf_base = NULL;
|
278
|
+
int r, frontHang;
|
279
|
+
@@ -182,6 +235,12 @@ ssize_t write_lseek_blockwise(int fd, int bsize, char *buf, size_t count, off_t
|
280
|
+
if (fd == -1 || !buf || bsize <= 0)
|
281
|
+
return -1;
|
282
|
+
|
283
|
+
+ if (offset < 0)
|
284
|
+
+ offset = lseek(fd, offset, SEEK_END);
|
285
|
+
+
|
286
|
+
+ if (offset < 0)
|
287
|
+
+ return -1;
|
288
|
+
+
|
289
|
+
frontHang = offset % bsize;
|
290
|
+
|
291
|
+
if (lseek(fd, offset - frontHang, SEEK_SET) < 0)
|
292
|
+
@@ -193,7 +252,7 @@ ssize_t write_lseek_blockwise(int fd, int bsize, char *buf, size_t count, off_t
|
293
|
+
if (!frontPadBuf)
|
294
|
+
goto out;
|
295
|
+
|
296
|
+
- r = read(fd, frontPadBuf, bsize);
|
297
|
+
+ r = read_buffer(fd, frontPadBuf, bsize);
|
298
|
+
if (r < 0 || r != bsize)
|
299
|
+
goto out;
|
300
|
+
|
301
|
+
@@ -206,11 +265,11 @@ ssize_t write_lseek_blockwise(int fd, int bsize, char *buf, size_t count, off_t
|
302
|
+
if (lseek(fd, offset - frontHang, SEEK_SET) < 0)
|
303
|
+
goto out;
|
304
|
+
|
305
|
+
- r = write(fd, frontPadBuf, bsize);
|
306
|
+
+ r = write_buffer(fd, frontPadBuf, bsize);
|
307
|
+
if (r < 0 || r != bsize)
|
308
|
+
goto out;
|
309
|
+
|
310
|
+
- buf += innerCount;
|
311
|
+
+ buf = (char*)buf + innerCount;
|
312
|
+
count -= innerCount;
|
313
|
+
}
|
314
|
+
|
315
|
+
@@ -223,6 +282,58 @@ out:
|
316
|
+
return ret;
|
317
|
+
}
|
318
|
+
|
319
|
+
+ssize_t read_lseek_blockwise(int fd, int bsize, void *buf, size_t count, off_t offset)
|
320
|
+
+{
|
321
|
+
+ char *frontPadBuf;
|
322
|
+
+ void *frontPadBuf_base = NULL;
|
323
|
+
+ int r, frontHang;
|
324
|
+
+ size_t innerCount = 0;
|
325
|
+
+ ssize_t ret = -1;
|
326
|
+
+
|
327
|
+
+ if (fd == -1 || !buf || bsize <= 0)
|
328
|
+
+ return -1;
|
329
|
+
+
|
330
|
+
+ if (offset < 0)
|
331
|
+
+ offset = lseek(fd, offset, SEEK_END);
|
332
|
+
+
|
333
|
+
+ if (offset < 0)
|
334
|
+
+ return -1;
|
335
|
+
+
|
336
|
+
+ frontHang = offset % bsize;
|
337
|
+
+
|
338
|
+
+ if (lseek(fd, offset - frontHang, SEEK_SET) < 0)
|
339
|
+
+ return ret;
|
340
|
+
+
|
341
|
+
+ if (frontHang) {
|
342
|
+
+ frontPadBuf = aligned_malloc(&frontPadBuf_base,
|
343
|
+
+ bsize, get_alignment(fd));
|
344
|
+
+
|
345
|
+
+ if (!frontPadBuf)
|
346
|
+
+ return ret;
|
347
|
+
+
|
348
|
+
+ r = read_buffer(fd, frontPadBuf, bsize);
|
349
|
+
+ if (r < 0 || r != bsize)
|
350
|
+
+ goto out;
|
351
|
+
+
|
352
|
+
+ innerCount = bsize - frontHang;
|
353
|
+
+ if (innerCount > count)
|
354
|
+
+ innerCount = count;
|
355
|
+
+
|
356
|
+
+ memcpy(buf, frontPadBuf + frontHang, innerCount);
|
357
|
+
+
|
358
|
+
+ buf = (char*)buf + innerCount;
|
359
|
+
+ count -= innerCount;
|
360
|
+
+ }
|
361
|
+
+
|
362
|
+
+ ret = read_blockwise(fd, bsize, buf, count);
|
363
|
+
+ if (ret >= 0)
|
364
|
+
+ ret += innerCount;
|
365
|
+
+out:
|
366
|
+
+ free(frontPadBuf_base);
|
367
|
+
+
|
368
|
+
+ return ret;
|
369
|
+
+}
|
370
|
+
+
|
371
|
+
/* MEMLOCK */
|
372
|
+
#define DEFAULT_PROCESS_PRIORITY -18
|
373
|
+
|
374
|
+
--
|
375
|
+
2.7.4
|
376
|
+
|
@@ -0,0 +1,50 @@
|
|
1
|
+
diff -rupN cryptsetup-1.7.4.bcp/lib/utils.c cryptsetup-1.7.4/lib/utils.c
|
2
|
+
--- cryptsetup-1.7.4.bcp/lib/utils.c 2017-10-18 11:39:01.694902755 +0200
|
3
|
+
+++ cryptsetup-1.7.4/lib/utils.c 2017-10-18 11:48:16.584868357 +0200
|
4
|
+
@@ -252,21 +252,21 @@ ssize_t write_lseek_blockwise(int fd, in
|
5
|
+
if (!frontPadBuf)
|
6
|
+
goto out;
|
7
|
+
|
8
|
+
- r = read_buffer(fd, frontPadBuf, bsize);
|
9
|
+
- if (r < 0 || r != bsize)
|
10
|
+
- goto out;
|
11
|
+
-
|
12
|
+
innerCount = bsize - frontHang;
|
13
|
+
if (innerCount > count)
|
14
|
+
innerCount = count;
|
15
|
+
|
16
|
+
+ r = read_buffer(fd, frontPadBuf, bsize);
|
17
|
+
+ if (r < (frontHang + innerCount))
|
18
|
+
+ goto out;
|
19
|
+
+
|
20
|
+
memcpy(frontPadBuf + frontHang, buf, innerCount);
|
21
|
+
|
22
|
+
if (lseek(fd, offset - frontHang, SEEK_SET) < 0)
|
23
|
+
goto out;
|
24
|
+
|
25
|
+
- r = write_buffer(fd, frontPadBuf, bsize);
|
26
|
+
- if (r < 0 || r != bsize)
|
27
|
+
+ r = write_buffer(fd, frontPadBuf, frontHang + innerCount);
|
28
|
+
+ if (r != (frontHang + innerCount))
|
29
|
+
goto out;
|
30
|
+
|
31
|
+
buf = (char*)buf + innerCount;
|
32
|
+
@@ -311,14 +311,14 @@ ssize_t read_lseek_blockwise(int fd, int
|
33
|
+
if (!frontPadBuf)
|
34
|
+
return ret;
|
35
|
+
|
36
|
+
- r = read_buffer(fd, frontPadBuf, bsize);
|
37
|
+
- if (r < 0 || r != bsize)
|
38
|
+
- goto out;
|
39
|
+
-
|
40
|
+
innerCount = bsize - frontHang;
|
41
|
+
if (innerCount > count)
|
42
|
+
innerCount = count;
|
43
|
+
|
44
|
+
+ r = read_buffer(fd, frontPadBuf, bsize);
|
45
|
+
+ if (r < (frontHang + innerCount))
|
46
|
+
+ goto out;
|
47
|
+
+
|
48
|
+
memcpy(buf, frontPadBuf + frontHang, innerCount);
|
49
|
+
|
50
|
+
buf = (char*)buf + innerCount;
|
@@ -0,0 +1,56 @@
|
|
1
|
+
--- a/lib/crypto_backend/crypto_cipher_kernel.c
|
2
|
+
+++ b/lib/crypto_backend/crypto_cipher_kernel.c
|
3
|
+
|
4
|
+
#ifdef ENABLE_AF_ALG
|
5
|
+
|
6
|
+
#include <linux/if_alg.h>
|
7
|
+
+#include <sys/utsname.h>
|
8
|
+
|
9
|
+
#ifndef AF_ALG
|
10
|
+
#define AF_ALG 38
|
11
|
+
@@ -88,6 +89,35 @@ int crypt_cipher_blocksize(const char *n
|
12
|
+
return ca ? ca->blocksize : -EINVAL;
|
13
|
+
}
|
14
|
+
|
15
|
+
+static size_t pagesize(size_t defsize)
|
16
|
+
+{
|
17
|
+
+ long r = sysconf(_SC_PAGESIZE);
|
18
|
+
+ return r < 0 ? defsize : (size_t)r;
|
19
|
+
+}
|
20
|
+
+
|
21
|
+
+static int check_rh_kernel_version(void)
|
22
|
+
+{
|
23
|
+
+ unsigned maj, mid, min, rel;
|
24
|
+
+ static struct utsname uts = {{ 0 }};
|
25
|
+
+ size_t ps = pagesize(32768);
|
26
|
+
+
|
27
|
+
+ if (ps < 32768)
|
28
|
+
+ return 0;
|
29
|
+
+
|
30
|
+
+ if (!*uts.release && uname(&uts) < 0)
|
31
|
+
+ return -ENOTSUP;
|
32
|
+
+ /*
|
33
|
+
+ * RH kernels 3.10.0-185 and lower are affected by a crypto API kernel
|
34
|
+
+ * socket bug. The bug only manifests on archs with page size >= 32 KiB.
|
35
|
+
+ *
|
36
|
+
+ * For reference, see rhbz#1136075
|
37
|
+
+ */
|
38
|
+
+ if (sscanf(uts.release, "%u.%u.%u-%u", &maj, &mid, &min, &rel) == 4)
|
39
|
+
+ return (maj == 3 && mid == 10 && min == 0 && rel < 186) ? -ENOTSUP : 0;
|
40
|
+
+
|
41
|
+
+ return -ENOTSUP;
|
42
|
+
+}
|
43
|
+
+
|
44
|
+
/*
|
45
|
+
* ciphers
|
46
|
+
*
|
47
|
+
@@ -104,6 +134,9 @@ int crypt_cipher_init(struct crypt_ciphe
|
48
|
+
.salg_type = "skcipher",
|
49
|
+
};
|
50
|
+
|
51
|
+
+ if (check_rh_kernel_version())
|
52
|
+
+ return -ENOTSUP;
|
53
|
+
+
|
54
|
+
h = malloc(sizeof(*h));
|
55
|
+
if (!h)
|
56
|
+
return -ENOMEM;
|
@@ -0,0 +1,579 @@
|
|
1
|
+
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
2
|
+
|
3
|
+
%define python3_enable 0
|
4
|
+
|
5
|
+
Summary: A utility for setting up encrypted disks
|
6
|
+
Name: cryptsetup
|
7
|
+
Version: 1.7.4
|
8
|
+
Release: 3%{?dist}.1
|
9
|
+
License: GPLv2+ and LGPLv2+
|
10
|
+
Group: Applications/System
|
11
|
+
URL: https://gitlab.com/cryptsetup/cryptsetup
|
12
|
+
BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel
|
13
|
+
BuildRequires: libgpg-error-devel, libuuid-devel, libsepol-devel
|
14
|
+
BuildRequires: libselinux-devel, python-devel, libpwquality-devel
|
15
|
+
%if %{python3_enable}
|
16
|
+
BuildRequires: python3-devel
|
17
|
+
%endif
|
18
|
+
Provides: cryptsetup-luks = %{version}-%{release}
|
19
|
+
Obsoletes: cryptsetup-luks < 1.4.0
|
20
|
+
Requires: cryptsetup-libs%{?_isa} = %{version}-%{release}
|
21
|
+
Requires: libpwquality >= 1.2.0
|
22
|
+
|
23
|
+
%define dracutmodulesdir %{_prefix}/lib/dracut/modules.d
|
24
|
+
%define upstream_version %{version}
|
25
|
+
Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/cryptsetup-%{upstream_version}.tar.xz
|
26
|
+
Patch0: %{name}-avoid-rh-kernel-bug.patch
|
27
|
+
Patch1: %{name}-1.7.5-fix-unaligned-access-to-hidden-truecrypt.patch
|
28
|
+
Patch2: %{name}-1.7.5-fix-luksformat-in-fips-mode.patch
|
29
|
+
Patch3: %{name}-1.7.6-fix-blockwise-access-functions-for-64k-page-size.patch
|
30
|
+
|
31
|
+
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
|
32
|
+
%define configure_cipher --enable-gcrypt-pbkdf2
|
33
|
+
%else
|
34
|
+
%define configure_cipher --with-luks1-cipher=aes --with-luks1-mode=cbc-essiv:sha256 --with-luks1-keybits=256
|
35
|
+
%endif
|
36
|
+
|
37
|
+
%description
|
38
|
+
The cryptsetup package contains a utility for setting up
|
39
|
+
disk encryption using dm-crypt kernel module.
|
40
|
+
|
41
|
+
%package devel
|
42
|
+
Group: Development/Libraries
|
43
|
+
Requires: %{name} = %{version}-%{release}
|
44
|
+
Requires: libgcrypt-devel > 1.1.42, device-mapper-devel, libuuid-devel
|
45
|
+
Requires: pkgconfig
|
46
|
+
Summary: Headers and libraries for using encrypted file systems
|
47
|
+
Provides: cryptsetup-luks-devel = %{version}-%{release}
|
48
|
+
Obsoletes: cryptsetup-luks-devel < 1.4.0
|
49
|
+
|
50
|
+
%description devel
|
51
|
+
The cryptsetup-devel package contains libraries and header files
|
52
|
+
used for writing code that makes use of disk encryption.
|
53
|
+
|
54
|
+
%package libs
|
55
|
+
Group: System Environment/Libraries
|
56
|
+
Summary: Cryptsetup shared library
|
57
|
+
Provides: cryptsetup-luks-libs = %{version}-%{release}
|
58
|
+
Obsoletes: cryptsetup-luks-libs < 1.4.0
|
59
|
+
Obsoletes: cryptsetup-reencrypt-libs < 1.6.5
|
60
|
+
# Need support for empty password in gcrypt PBKDF2
|
61
|
+
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
|
62
|
+
Requires: libgcrypt >= 1.5.3-3
|
63
|
+
%endif
|
64
|
+
|
65
|
+
%description libs
|
66
|
+
This package contains the cryptsetup shared library, libcryptsetup.
|
67
|
+
|
68
|
+
%package -n veritysetup
|
69
|
+
Group: Applications/System
|
70
|
+
Summary: A utility for setting up dm-verity volumes
|
71
|
+
Requires: cryptsetup-libs = %{version}-%{release}
|
72
|
+
|
73
|
+
%description -n veritysetup
|
74
|
+
The veritysetup package contains a utility for setting up
|
75
|
+
disk verification using dm-verity kernel module.
|
76
|
+
|
77
|
+
%package reencrypt
|
78
|
+
Group: Applications/System
|
79
|
+
Summary: A utility for offline reencryption of LUKS encrypted disks.
|
80
|
+
Provides: cryptsetup-reencrypt = %{version}-%{release}
|
81
|
+
Obsoletes: cryptsetup-reencrypt < 1.6.5
|
82
|
+
Requires: cryptsetup-libs = %{version}-%{release}
|
83
|
+
|
84
|
+
%description reencrypt
|
85
|
+
This package contains cryptsetup-reencrypt utility which
|
86
|
+
can be used for offline reencryption of disk in situ.
|
87
|
+
Also includes dracut module required to perform reencryption
|
88
|
+
of device containing a root filesystem.
|
89
|
+
|
90
|
+
%package python
|
91
|
+
Group: System Environment/Libraries
|
92
|
+
Summary: Python bindings for libcryptsetup
|
93
|
+
Requires: %{name}-libs = %{version}-%{release}
|
94
|
+
Provides: python-cryptsetup = %{version}-%{release}
|
95
|
+
Obsoletes: python-cryptsetup < 1.4.0
|
96
|
+
|
97
|
+
%description python
|
98
|
+
This package provides Python bindings for libcryptsetup, a library
|
99
|
+
for setting up disk encryption using dm-crypt kernel module.
|
100
|
+
|
101
|
+
%if %{python3_enable}
|
102
|
+
%package python3
|
103
|
+
Group: System Environment/Libraries
|
104
|
+
Summary: Python3 bindings for libcryptsetup
|
105
|
+
Requires: %{name}-libs = %{version}-%{release}
|
106
|
+
Provides: python3-cryptsetup = %{version}-%{release}
|
107
|
+
|
108
|
+
%description python3
|
109
|
+
This package provides Python bindings for libcryptsetup, a library
|
110
|
+
for setting up disk encryption using dm-crypt kernel module.
|
111
|
+
%endif
|
112
|
+
|
113
|
+
%prep
|
114
|
+
%setup -q -n cryptsetup-%{upstream_version}
|
115
|
+
%patch0 -p1
|
116
|
+
%patch1 -p1
|
117
|
+
%patch2 -p1
|
118
|
+
%patch3 -p1
|
119
|
+
chmod -x python/pycryptsetup-test.py
|
120
|
+
|
121
|
+
%if %{python3_enable}
|
122
|
+
# copy the whole directory for the python3 build
|
123
|
+
cp -a . %{py3dir}
|
124
|
+
%endif
|
125
|
+
|
126
|
+
%build
|
127
|
+
%configure --enable-python --enable-fips --enable-cryptsetup-reencrypt --enable-pwquality %{?configure_cipher}
|
128
|
+
# remove rpath
|
129
|
+
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
130
|
+
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
131
|
+
make %{?_smp_mflags}
|
132
|
+
|
133
|
+
%if %{python3_enable}
|
134
|
+
pushd %{py3dir}
|
135
|
+
%configure --enable-python --with-python_version=3
|
136
|
+
make %{?_smp_mflags}
|
137
|
+
popd
|
138
|
+
%endif
|
139
|
+
|
140
|
+
%install
|
141
|
+
make install DESTDIR=%{buildroot}
|
142
|
+
rm -rf %{buildroot}/%{_libdir}/*.la
|
143
|
+
|
144
|
+
%if %{python3_enable}
|
145
|
+
pushd %{py3dir}
|
146
|
+
make install DESTDIR=%{buildroot}
|
147
|
+
rm -rf %{buildroot}/%{_libdir}/*.la
|
148
|
+
popd
|
149
|
+
%endif
|
150
|
+
|
151
|
+
%find_lang cryptsetup
|
152
|
+
|
153
|
+
install -d -m755 %{buildroot}/%{dracutmodulesdir}/90reencrypt
|
154
|
+
install -m755 misc/dracut_90reencrypt/module-setup.sh %{buildroot}/%{dracutmodulesdir}/90reencrypt
|
155
|
+
install -m755 misc/dracut_90reencrypt/parse-reencrypt.sh %{buildroot}/%{dracutmodulesdir}/90reencrypt
|
156
|
+
install -m755 misc/dracut_90reencrypt/reencrypt.sh %{buildroot}/%{dracutmodulesdir}/90reencrypt
|
157
|
+
|
158
|
+
%post -n cryptsetup-libs -p /sbin/ldconfig
|
159
|
+
|
160
|
+
%postun -n cryptsetup-libs -p /sbin/ldconfig
|
161
|
+
|
162
|
+
%files
|
163
|
+
%{!?_licensedir:%global license %%doc}
|
164
|
+
%license COPYING
|
165
|
+
%doc AUTHORS FAQ docs/*ReleaseNotes
|
166
|
+
%{_mandir}/man8/cryptsetup.8.gz
|
167
|
+
%{_sbindir}/cryptsetup
|
168
|
+
|
169
|
+
%files -n veritysetup
|
170
|
+
%{!?_licensedir:%global license %%doc}
|
171
|
+
%license COPYING
|
172
|
+
%{_mandir}/man8/veritysetup.8.gz
|
173
|
+
%{_sbindir}/veritysetup
|
174
|
+
|
175
|
+
%files reencrypt
|
176
|
+
%{!?_licensedir:%global license %%doc}
|
177
|
+
%license COPYING
|
178
|
+
%doc misc/dracut_90reencrypt/README
|
179
|
+
%{_mandir}/man8/cryptsetup-reencrypt.8.gz
|
180
|
+
%{_sbindir}/cryptsetup-reencrypt
|
181
|
+
%{dracutmodulesdir}/90reencrypt
|
182
|
+
%{dracutmodulesdir}/90reencrypt/*
|
183
|
+
|
184
|
+
%files devel
|
185
|
+
%doc docs/examples/*
|
186
|
+
%{_includedir}/libcryptsetup.h
|
187
|
+
%{_libdir}/libcryptsetup.so
|
188
|
+
%{_libdir}/pkgconfig/libcryptsetup.pc
|
189
|
+
|
190
|
+
%files libs -f cryptsetup.lang
|
191
|
+
%{!?_licensedir:%global license %%doc}
|
192
|
+
%license COPYING COPYING.LGPL
|
193
|
+
%{_libdir}/libcryptsetup.so.*
|
194
|
+
|
195
|
+
%files python
|
196
|
+
%{!?_licensedir:%global license %%doc}
|
197
|
+
%license COPYING.LGPL
|
198
|
+
%doc python/pycryptsetup-test.py
|
199
|
+
%exclude %{python_sitearch}/pycryptsetup.la
|
200
|
+
%{python_sitearch}/pycryptsetup.so
|
201
|
+
|
202
|
+
%if %{python3_enable}
|
203
|
+
%files python3
|
204
|
+
%{!?_licensedir:%global license %%doc}
|
205
|
+
%license COPYING.LGPL
|
206
|
+
%doc python/pycryptsetup-test.py
|
207
|
+
%exclude %{python3_sitearch}/pycryptsetup.la
|
208
|
+
%{python3_sitearch}/pycryptsetup.so
|
209
|
+
%endif
|
210
|
+
|
211
|
+
%clean
|
212
|
+
|
213
|
+
%changelog
|
214
|
+
* Thu Nov 16 2017 Ondrej Kozina <okozina@redhat.com> - 1.7.4-3.el7_4.1
|
215
|
+
- patch: fix regression in blockwise functions (archs with 64 KiB
|
216
|
+
page_size)
|
217
|
+
- Resolves: #1510841
|
218
|
+
|
219
|
+
* Tue Apr 25 2017 Ondrej Kozina <okozina@redhat.com> - 1.7.4-3
|
220
|
+
- patch: fix luksFormat failure while running in FIPS mode.
|
221
|
+
- Resolves: #1444137
|
222
|
+
|
223
|
+
* Tue Apr 04 2017 Ondrej Kozina <okozina@redhat.com> - 1.7.4-2
|
224
|
+
- patch: fix access to unaligned hidden TrueCrypt header.
|
225
|
+
- Resolves: #1435543
|
226
|
+
|
227
|
+
* Wed Mar 15 2017 Ondrej Kozina <okozina@redhat.com> - 1.7.4-1
|
228
|
+
- Update to cryptsetup 1.7.4.
|
229
|
+
- Resolves: #1381273
|
230
|
+
|
231
|
+
* Tue Jun 7 2016 Ondrej Kozina <okozina@redhat.com> - 1.7.2-1
|
232
|
+
- Update to cryptsetup 1.7.2.
|
233
|
+
- Resolves: #1302022 #1070825
|
234
|
+
|
235
|
+
* Thu Jun 18 2015 Ondrej Kozina <okozina@redhat.com> - 1.6.7-1
|
236
|
+
- Update to cryptsetup 1.6.7.
|
237
|
+
- patch: avoid use of kernel crypto API socket which is known
|
238
|
+
to be broken in RHEL7.0 kernel (7.1+ is fine).
|
239
|
+
- Resolves: #1206170
|
240
|
+
|
241
|
+
* Thu Dec 18 2014 Ondrej Kozina <okozina@redhat.com> - 1.6.6-3
|
242
|
+
- drop FIPS power on self test and library checksum
|
243
|
+
- Resolves: #1158897
|
244
|
+
|
245
|
+
* Mon Sep 29 2014 Ondrej Kozina <okozina@redhat.com> - 1.6.6-2
|
246
|
+
- patch: fix failures related to reencrypt log files
|
247
|
+
- Resolves: #1140199
|
248
|
+
|
249
|
+
* Mon Sep 8 2014 Ondrej Kozina <okozina@redhat.com> - 1.6.6-1
|
250
|
+
- Update to cryptsetup 1.6.6.
|
251
|
+
- Resolves: #1117372 #1038097
|
252
|
+
|
253
|
+
* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 1.6.3-2
|
254
|
+
- Mass rebuild 2014-01-24
|
255
|
+
|
256
|
+
* Mon Jan 6 2014 Ondrej Kozina <okozina@redhat.com> - 1.6.3-1
|
257
|
+
- Update to cryptsetup 1.6.3.
|
258
|
+
- various fixes related to block devices with 4KiB sectors
|
259
|
+
- enable reencryption using specific keyslot (dracut module)
|
260
|
+
- fix failure in reading last keyslot from external LUKS header
|
261
|
+
- update FIPS POST to be complaint with actual requirements
|
262
|
+
- fix hash limiting if parameter is not numeric
|
263
|
+
- Resolves: #1028362 #1029032 #1029406 #1030288 #1034388 #1038097
|
264
|
+
|
265
|
+
* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 1.6.2-3
|
266
|
+
- Mass rebuild 2013-12-27
|
267
|
+
|
268
|
+
* Tue Nov 5 2013 Ondrej Kozina <okozina@redhat.com> - 1.6.2-2
|
269
|
+
- 90reencrypt: Move conflict with 90crypt to install() section.
|
270
|
+
- 90reencrypt: Drop to emergency_shell after successful reencryption.
|
271
|
+
- Resolves: #1021593
|
272
|
+
|
273
|
+
* Mon Oct 14 2013 Ondrej Kozina <okozina@redhat.com> - 1.6.2-1
|
274
|
+
- Update to cryptsetup 1.6.2.
|
275
|
+
- Add dracut module for cryptsetup-reencrypt (90reencrypt).
|
276
|
+
- 90reencrypt: Rename dracut parameteres to be compliant with actual naming guidance.
|
277
|
+
- 90reencrypt: Install and load loop kernel module.
|
278
|
+
- 90reencrypt: Fix lock file name.
|
279
|
+
- 90reencrypt: Add conflict with 90crypt dracut module (more info in #1010287)
|
280
|
+
- Resolves: #1010278 #1010287
|
281
|
+
|
282
|
+
* Sun Mar 31 2013 Milan Broz <gmazyland@gmail.com> - 1.6.1-1
|
283
|
+
- Update to cryptsetup 1.6.1.
|
284
|
+
- Install ReleaseNotes files instead of empty Changelog file.
|
285
|
+
|
286
|
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.0-2
|
287
|
+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
288
|
+
|
289
|
+
* Mon Jan 14 2013 Milan Broz <mbroz@redhat.com> - 1.6.0-1
|
290
|
+
- Update to cryptsetup 1.6.0.
|
291
|
+
- Change default LUKS encryption mode to aes-xts-plain64 (AES128).
|
292
|
+
- Force use of gcrypt PBKDF2 instead of internal implementation.
|
293
|
+
|
294
|
+
* Sat Dec 29 2012 Milan Broz <mbroz@redhat.com> - 1.6.0-0.1
|
295
|
+
- Update to cryptsetup 1.6.0-rc1.
|
296
|
+
- Relax license to GPLv2+ according to new release.
|
297
|
+
- Compile cryptsetup with libpwquality support.
|
298
|
+
|
299
|
+
* Tue Oct 16 2012 Milan Broz <mbroz@redhat.com> - 1.5.1-1
|
300
|
+
- Update to cryptsetup 1.5.1.
|
301
|
+
|
302
|
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-2
|
303
|
+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
304
|
+
|
305
|
+
* Tue Jul 10 2012 Milan Broz <mbroz@redhat.com> - 1.5.0-1
|
306
|
+
- Update to cryptsetup 1.5.0.
|
307
|
+
|
308
|
+
* Wed Jun 20 2012 Milan Broz <mbroz@redhat.com> - 1.5.0-0.2
|
309
|
+
- Update to cryptsetup 1.5.0-rc2.
|
310
|
+
- Add cryptsetup-reencrypt subpackage.
|
311
|
+
|
312
|
+
* Mon Jun 11 2012 Milan Broz <mbroz@redhat.com> - 1.5.0-0.1
|
313
|
+
- Update to cryptsetup 1.5.0-rc1.
|
314
|
+
- Add veritysetup subpackage.
|
315
|
+
- Move localization files to libs subpackage.
|
316
|
+
|
317
|
+
* Thu May 31 2012 Milan Broz <mbroz@redhat.com> - 1.4.3-2
|
318
|
+
- Build with fipscheck (verification in fips mode).
|
319
|
+
- Clean up spec file, use install to /usr.
|
320
|
+
|
321
|
+
* Thu May 31 2012 Milan Broz <mbroz@redhat.com> - 1.4.3-1
|
322
|
+
- Update to cryptsetup 1.4.3.
|
323
|
+
|
324
|
+
* Thu Apr 12 2012 Milan Broz <mbroz@redhat.com> - 1.4.2-1
|
325
|
+
- Update to cryptsetup 1.4.2.
|
326
|
+
|
327
|
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.1-2
|
328
|
+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
329
|
+
|
330
|
+
* Wed Nov 09 2011 Milan Broz <mbroz@redhat.com> - 1.4.1-1
|
331
|
+
- Update to cryptsetup 1.4.1.
|
332
|
+
- Add Python cryptsetup bindings.
|
333
|
+
- Obsolete separate python-cryptsetup package.
|
334
|
+
|
335
|
+
* Wed Oct 26 2011 Milan Broz <mbroz@redhat.com> - 1.4.0-1
|
336
|
+
- Update to cryptsetup 1.4.0.
|
337
|
+
|
338
|
+
* Mon Oct 10 2011 Milan Broz <mbroz@redhat.com> - 1.4.0-0.1
|
339
|
+
- Update to cryptsetup 1.4.0-rc1.
|
340
|
+
- Rename package back from cryptsetup-luks to cryptsetup.
|
341
|
+
|
342
|
+
* Wed Jun 22 2011 Milan Broz <mbroz@redhat.com> - 1.3.1-2
|
343
|
+
- Fix return code for status command when device doesn't exist.
|
344
|
+
|
345
|
+
* Tue May 24 2011 Milan Broz <mbroz@redhat.com> - 1.3.1-1
|
346
|
+
- Update to cryptsetup 1.3.1.
|
347
|
+
|
348
|
+
* Tue Apr 05 2011 Milan Broz <mbroz@redhat.com> - 1.3.0-1
|
349
|
+
- Update to cryptsetup 1.3.0.
|
350
|
+
|
351
|
+
* Tue Mar 22 2011 Milan Broz <mbroz@redhat.com> - 1.3.0-0.2
|
352
|
+
- Update to cryptsetup 1.3.0-rc2
|
353
|
+
|
354
|
+
* Mon Mar 14 2011 Milan Broz <mbroz@redhat.com> - 1.3.0-0.1
|
355
|
+
- Update to cryptsetup 1.3.0-rc1
|
356
|
+
|
357
|
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-2
|
358
|
+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
359
|
+
|
360
|
+
* Mon Dec 20 2010 Milan Broz <mbroz@redhat.com> - 1.2.0-1
|
361
|
+
- Update to cryptsetup 1.2.0
|
362
|
+
|
363
|
+
* Thu Nov 25 2010 Milan Broz <mbroz@redhat.com> - 1.2.0-0.2
|
364
|
+
- Fix crypt_activate_by_keyfile() to work with PLAIN devices.
|
365
|
+
|
366
|
+
* Tue Nov 16 2010 Milan Broz <mbroz@redhat.com> - 1.2.0-0.1
|
367
|
+
- Add FAQ to documentation.
|
368
|
+
- Update to cryptsetup 1.2.0-rc1
|
369
|
+
|
370
|
+
* Sat Jul 03 2010 Milan Broz <mbroz@redhat.com> - 1.1.3-1
|
371
|
+
- Update to cryptsetup 1.1.3
|
372
|
+
|
373
|
+
* Mon Jun 07 2010 Milan Broz <mbroz@redhat.com> - 1.1.2-2
|
374
|
+
- Fix alignment ioctl use.
|
375
|
+
- Fix API activation calls to handle NULL device name.
|
376
|
+
|
377
|
+
* Sun May 30 2010 Milan Broz <mbroz@redhat.com> - 1.1.2-1
|
378
|
+
- Update to cryptsetup 1.1.2
|
379
|
+
- Fix luksOpen handling of new line char on stdin.
|
380
|
+
|
381
|
+
* Sun May 23 2010 Milan Broz <mbroz@redhat.com> - 1.1.1-1
|
382
|
+
- Update to cryptsetup 1.1.1
|
383
|
+
- Fix luksClose for stacked LUKS/LVM devices.
|
384
|
+
|
385
|
+
* Mon May 03 2010 Milan Broz <mbroz@redhat.com> - 1.1.1-0.2
|
386
|
+
- Update to cryptsetup 1.1.1-rc2.
|
387
|
+
|
388
|
+
* Sat May 01 2010 Milan Broz <mbroz@redhat.com> - 1.1.1-0.1
|
389
|
+
- Update to cryptsetup 1.1.1-rc1.
|
390
|
+
|
391
|
+
* Sun Jan 17 2010 Milan Broz <mbroz@redhat.com> - 1.1.0-1
|
392
|
+
- Update to cryptsetup 1.1.0.
|
393
|
+
|
394
|
+
* Fri Jan 15 2010 Milan Broz <mbroz@redhat.com> - 1.1.0-0.6
|
395
|
+
- Fix gcrypt initialisation.
|
396
|
+
- Fix backward compatibility for hash algorithm (uppercase).
|
397
|
+
|
398
|
+
* Wed Dec 30 2009 Milan Broz <mbroz@redhat.com> - 1.1.0-0.5
|
399
|
+
- Update to cryptsetup 1.1.0-rc4
|
400
|
+
|
401
|
+
* Mon Nov 16 2009 Milan Broz <mbroz@redhat.com> - 1.1.0-0.4
|
402
|
+
- Update to cryptsetup 1.1.0-rc3
|
403
|
+
|
404
|
+
* Thu Oct 01 2009 Milan Broz <mbroz@redhat.com> - 1.1.0-0.3
|
405
|
+
- Update to cryptsetup 1.1.0-rc2
|
406
|
+
- Fix libcryptsetup to properly export only versioned symbols.
|
407
|
+
|
408
|
+
* Tue Sep 29 2009 Milan Broz <mbroz@redhat.com> - 1.1.0-0.2
|
409
|
+
- Update to cryptsetup 1.1.0-rc1
|
410
|
+
- Add luksHeaderBackup and luksHeaderRestore commands.
|
411
|
+
|
412
|
+
* Fri Sep 11 2009 Milan Broz <mbroz@redhat.com> - 1.1.0-0.1
|
413
|
+
- Update to new upstream testing version with new API interface.
|
414
|
+
- Add luksSuspend and luksResume commands.
|
415
|
+
- Introduce pkgconfig.
|
416
|
+
|
417
|
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.7-2
|
418
|
+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
419
|
+
|
420
|
+
* Wed Jul 22 2009 Milan Broz <mbroz@redhat.com> - 1.0.7-1
|
421
|
+
- Update to upstream final release.
|
422
|
+
- Split libs subpackage.
|
423
|
+
- Remove rpath setting from cryptsetup binary.
|
424
|
+
|
425
|
+
* Wed Jul 15 2009 Till Maas <opensource@till.name> - 1.0.7-0.2
|
426
|
+
- update BR because of libuuid splitout from e2fsprogs
|
427
|
+
|
428
|
+
* Mon Jun 22 2009 Milan Broz <mbroz@redhat.com> - 1.0.7-0.1
|
429
|
+
- Update to new upstream 1.0.7-rc1.
|
430
|
+
|
431
|
+
- Wipe old fs headers to not confuse blkid (#468062)
|
432
|
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.6-7
|
433
|
+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
434
|
+
|
435
|
+
* Thu Oct 30 2008 Milan Broz <mbroz@redhat.com> - 1.0.6-6
|
436
|
+
- Wipe old fs headers to not confuse blkid (#468062)
|
437
|
+
|
438
|
+
* Tue Sep 23 2008 Milan Broz <mbroz@redhat.com> - 1.0.6-5
|
439
|
+
- Change new project home page.
|
440
|
+
- Print more descriptive messages for initialization errors.
|
441
|
+
- Refresh patches to versions commited upstream.
|
442
|
+
|
443
|
+
* Sat Sep 06 2008 Milan Broz <mbroz@redhat.com> - 1.0.6-4
|
444
|
+
- Fix close of zero decriptor.
|
445
|
+
- Fix udevsettle delays - use temporary crypt device remapping.
|
446
|
+
|
447
|
+
* Wed May 28 2008 Till Maas <opensource till name> - 1.0.6-3
|
448
|
+
- remove a duplicate sentence from the manpage (RH #448705)
|
449
|
+
- add patch metadata about upstream status
|
450
|
+
|
451
|
+
* Tue Apr 15 2008 Bill Nottinghm <notting@redhat.com> - 1.0.6-2
|
452
|
+
- Add the device to the luksOpen prompt (#433406)
|
453
|
+
- Use iconv, not recode (#442574)
|
454
|
+
|
455
|
+
* Thu Mar 13 2008 Till Maas <opensource till name> - 1.0.6-1
|
456
|
+
- Update to latest version
|
457
|
+
- remove patches that have been merged upstream
|
458
|
+
|
459
|
+
* Mon Mar 03 2008 Till Maas <opensource till name> - 1.0.6-0.1.pre2
|
460
|
+
- Update to new version with several bugfixes
|
461
|
+
- remove patches that have been merged upstream
|
462
|
+
- add patch from cryptsetup newsgroup
|
463
|
+
- fix typo / missing luksRemoveKey in manpage (patch)
|
464
|
+
|
465
|
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.0.5-9
|
466
|
+
- Autorebuild for GCC 4.3
|
467
|
+
|
468
|
+
* Sat Jan 19 2008 Peter Jones <pjones@redhat.com> - 1.0.5-8
|
469
|
+
- Rebuild for broken deps.
|
470
|
+
|
471
|
+
* Thu Aug 30 2007 Till Maas <opensource till name> - 1.0.5-7
|
472
|
+
- update URL
|
473
|
+
- update license tag
|
474
|
+
- recode ChangeLog from latin1 to uf8
|
475
|
+
- add smp_mflags to make
|
476
|
+
|
477
|
+
* Fri Aug 24 2007 Till Maas <opensource till name> - 1.0.5-6
|
478
|
+
- cleanup BuildRequires:
|
479
|
+
- removed versions, packages in Fedora are new enough
|
480
|
+
- changed popt to popt-devel
|
481
|
+
|
482
|
+
* Thu Aug 23 2007 Till Maas <opensource till name> - 1.0.5-5
|
483
|
+
- fix devel subpackage requires
|
484
|
+
- remove empty NEWS README
|
485
|
+
- remove uneeded INSTALL
|
486
|
+
- remove uneeded ldconfig requires
|
487
|
+
- add readonly detection patch
|
488
|
+
|
489
|
+
* Wed Aug 08 2007 Till Maas <opensource till name> - 1.0.5-4
|
490
|
+
- disable patch2, libsepol is now detected by configure
|
491
|
+
- move libcryptsetup.so to %%{_libdir} instead of /%%{_lib}
|
492
|
+
|
493
|
+
* Fri Jul 27 2007 Till Maas <opensource till name> - 1.0.5-3
|
494
|
+
- Use /%%{_lib} instead of /lib to use /lib64 on 64bit archs
|
495
|
+
|
496
|
+
* Thu Jul 26 2007 Till Maas <opensource till name> - 1.0.5-2
|
497
|
+
- Use /lib as libdir (#243228)
|
498
|
+
- sync header and library (#215349)
|
499
|
+
- do not use %%makeinstall (recommended by PackageGuidelines)
|
500
|
+
- select sbindir with %%configure instead with make
|
501
|
+
- add TODO
|
502
|
+
|
503
|
+
* Wed Jun 13 2007 Jeremy Katz <katzj@redhat.com> - 1.0.5-1
|
504
|
+
- update to 1.0.5
|
505
|
+
|
506
|
+
* Mon Jun 04 2007 Peter Jones <pjones@redhat.com> - 1.0.3-5
|
507
|
+
- Don't build static any more.
|
508
|
+
|
509
|
+
* Mon Feb 05 2007 Alasdair Kergon <agk@redhat.com> - 1.0.3-4
|
510
|
+
- Add build dependency on new device-mapper-devel package.
|
511
|
+
- Add preun and post ldconfig requirements.
|
512
|
+
- Update BuildRoot.
|
513
|
+
|
514
|
+
* Wed Nov 1 2006 Peter Jones <pjones@redhat.com> - 1.0.3-3
|
515
|
+
- Require newer libselinux (#213414)
|
516
|
+
|
517
|
+
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.0.3-2.1
|
518
|
+
- rebuild
|
519
|
+
|
520
|
+
* Wed Jun 7 2006 Jeremy Katz <katzj@redhat.com> - 1.0.3-2
|
521
|
+
- put shared libs in the right subpackages
|
522
|
+
|
523
|
+
* Fri Apr 7 2006 Bill Nottingham <notting@redhat.com> 1.0.3-1
|
524
|
+
- update to final 1.0.3
|
525
|
+
|
526
|
+
* Mon Feb 27 2006 Bill Nottingham <notting@redhat.com> 1.0.3-0.rc2
|
527
|
+
- update to 1.0.3rc2, fixes bug with HAL & encrypted devices (#182658)
|
528
|
+
|
529
|
+
* Wed Feb 22 2006 Bill Nottingham <notting@redhat.com> 1.0.3-0.rc1
|
530
|
+
- update to 1.0.3rc1, reverts changes to default encryption type
|
531
|
+
|
532
|
+
* Tue Feb 21 2006 Bill Nottingham <notting@redhat.com> 1.0.2-1
|
533
|
+
- update to 1.0.2, fix incompatiblity with old cryptsetup (#176726)
|
534
|
+
|
535
|
+
* Mon Feb 20 2006 Karsten Hopp <karsten@redhat.de> 1.0.1-5
|
536
|
+
- BuildRequires: libselinux-devel
|
537
|
+
|
538
|
+
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.0.1-4.2.1
|
539
|
+
- bump again for double-long bug on ppc(64)
|
540
|
+
|
541
|
+
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.0.1-4.2
|
542
|
+
- rebuilt for new gcc4.1 snapshot and glibc changes
|
543
|
+
|
544
|
+
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
|
545
|
+
- rebuilt
|
546
|
+
|
547
|
+
* Mon Dec 5 2005 Bill Nottingham <notting@redhat.com> 1.0.1-4
|
548
|
+
- rebuild against new libdevmapper
|
549
|
+
|
550
|
+
* Thu Oct 13 2005 Florian La Roche <laroche@redhat.com>
|
551
|
+
- add -lsepol to rebuild on current fc5
|
552
|
+
|
553
|
+
* Mon Aug 22 2005 Karel Zak <kzak@redhat.com> 1.0.1-2
|
554
|
+
- fix cryptsetup help for isLuks action
|
555
|
+
|
556
|
+
* Fri Jul 1 2005 Bill Nottingham <notting@redhat.com> 1.0.1-1
|
557
|
+
- update to 1.0.1 - fixes incompatiblity with previous cryptsetup for
|
558
|
+
piped passwords
|
559
|
+
|
560
|
+
* Thu Jun 16 2005 Bill Nottingham <notting@redhat.com> 1.0-2
|
561
|
+
- add patch for 32/64 bit compatibility (#160445, <redhat@paukstadt.de>)
|
562
|
+
|
563
|
+
* Tue Mar 29 2005 Bill Nottingham <notting@redhat.com> 1.0-1
|
564
|
+
- update to 1.0
|
565
|
+
|
566
|
+
* Thu Mar 10 2005 Bill Nottingham <notting@redhat.com> 0.993-1
|
567
|
+
- switch to cryptsetup-luks, for LUKS support
|
568
|
+
|
569
|
+
* Tue Oct 12 2004 Bill Nottingham <notting@redhat.com> 0.1-4
|
570
|
+
- oops, make that *everything* static (#129926)
|
571
|
+
|
572
|
+
* Tue Aug 31 2004 Bill Nottingham <notting@redhat.com> 0.1-3
|
573
|
+
- link some things static, move to /sbin (#129926)
|
574
|
+
|
575
|
+
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
|
576
|
+
- rebuilt
|
577
|
+
|
578
|
+
* Fri Apr 16 2004 Bill Nottingham <notting@redhat.com> 0.1-1
|
579
|
+
- initial packaging
|