eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-13 20:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix gcrypt detection & compatimage in api-test.

Browse Source 
git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@212 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
Milan Broz
2010-05-01 09:59:12 +00:00
parent 5107296213
commit f47b7ba425
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/api-test.c
View File

@@ -169,8 +169,10 @@ static void _setup(void)
r = system("dmsetup create " DEVICE_EMPTY_name " --table \"0 10000 zero\""); r = system("dmsetup create " DEVICE_EMPTY_name " --table \"0 10000 zero\"");
r = system("dmsetup create " DEVICE_ERROR_name " --table \"0 10000 error\""); r = system("dmsetup create " DEVICE_ERROR_name " --table \"0 10000 error\"");
if (!strncmp("/dev/loop", DEVICE_1, 9)) if (!strncmp("/dev/loop", DEVICE_1, 9)) {
r = system(" [ ! -e " IMAGE1 " ] && bzip2 -dk " IMAGE1 ".bz2");
r = system("losetup " DEVICE_1 " " IMAGE1); r = system("losetup " DEVICE_1 " " IMAGE1);
}
if (!strncmp("/dev/loop", DEVICE_2, 9)) { if (!strncmp("/dev/loop", DEVICE_2, 9)) {
r = system("dd if=/dev/zero of=" IMAGE_EMPTY " bs=1M count=4"); r = system("dd if=/dev/zero of=" IMAGE_EMPTY " bs=1M count=4");
r = system("losetup " DEVICE_2 " " IMAGE_EMPTY); r = system("losetup " DEVICE_2 " " IMAGE_EMPTY);
@@ -729,7 +731,7 @@ static void _gcrypt_compatible()
if (!(f = popen("libgcrypt-config --version", "r"))) if (!(f = popen("libgcrypt-config --version", "r")))
return; return;
if (fscanf(f, "%d.%d.%d", &maj, &min, &patch) == 2 && if (fscanf(f, "%d.%d.%d", &maj, &min, &patch) == 3 &&
maj >= 1 && min >= 4) maj >= 1 && min >= 4)
gcrypt_compatible = 1; gcrypt_compatible = 1;
if (_debug) if (_debug)