From ee8425b8365532217c5aa132a5d80eae1d3881df Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Mon, 2 Apr 2012 22:03:05 +0200 Subject: [PATCH] Version 1.4.2. Add header and copyright for header files. --- ChangeLog | 3 +++ configure.in | 2 +- docs/v1.4.2-ReleaseNotes | 41 +++++++++++++++++++++++++++++ lib/crypto_backend/crypto_backend.h | 18 +++++++++++++ lib/crypto_backend/crypto_gcrypt.c | 2 +- lib/crypto_backend/crypto_kernel.c | 2 +- lib/crypto_backend/crypto_nettle.c | 2 +- lib/crypto_backend/crypto_nss.c | 2 +- lib/crypto_backend/crypto_openssl.c | 2 +- lib/internal.h | 21 +++++++++++++++ lib/libcryptsetup.h | 21 +++++++++++++++ lib/libdevmapper.c | 2 +- lib/loopaes/loopaes.c | 2 +- lib/loopaes/loopaes.h | 19 +++++++++++++ lib/luks1/af.c | 2 +- lib/luks1/af.h | 25 +++++++++++++++--- lib/luks1/keyencryption.c | 1 + lib/luks1/keymanage.c | 1 + lib/luks1/luks.h | 20 ++++++++++++++ lib/luks1/pbkdf.c | 5 ++-- lib/luks1/pbkdf.h | 25 ++++++++++++++++++ lib/nls.h | 2 +- lib/random.c | 2 +- lib/setup.c | 2 +- lib/utils.c | 2 +- lib/utils_crypt.c | 4 +-- lib/utils_crypt.h | 20 ++++++++++++++ lib/utils_debug.c | 2 +- lib/utils_devpath.c | 2 +- lib/utils_dm.h | 21 +++++++++++++++ lib/utils_loop.c | 2 +- lib/utils_loop.h | 19 +++++++++++++ lib/utils_wipe.c | 2 +- lib/volumekey.c | 2 +- python/pycryptsetup.c | 2 +- src/cryptsetup.c | 2 +- src/cryptsetup.h | 21 +++++++++++++++ tests/api-test.c | 2 +- tests/differ.c | 2 +- 39 files changed, 299 insertions(+), 30 deletions(-) create mode 100644 docs/v1.4.2-ReleaseNotes diff --git a/ChangeLog b/ChangeLog index 7f4c89ed..b56724fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2012-04-02 Milan Broz + * Version 1.4.2. + 2012-03-16 Milan Broz * Add --keyfile-offset and --new-keyfile-offset parameters to API and CLI. * Add repair command and crypt_repair() for known LUKS metadata problems repair. diff --git a/configure.in b/configure.in index 2ad29c87..2397a3a5 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ AC_PREREQ([2.67]) -AC_INIT([cryptsetup],[1.4.1]) +AC_INIT([cryptsetup],[1.4.2]) dnl library version from ..[-] LIBCRYPTSETUP_VERSION=$(echo $PACKAGE_VERSION | cut -f1 -d-) diff --git a/docs/v1.4.2-ReleaseNotes b/docs/v1.4.2-ReleaseNotes new file mode 100644 index 00000000..afcc2b7a --- /dev/null +++ b/docs/v1.4.2-ReleaseNotes @@ -0,0 +1,41 @@ +Cryptsetup 1.4.2 Release Notes +============================== + +Changes since version 1.4.1 + +* Add --keyfile-offset and --new-keyfile-offset parameters to API and CLI. + These options can be used to skip start of keyfile or device used as keyfile. + +* Add repair command and crypt_repair() for known LUKS metadata problems repair. + + Some well-known LUKS metadata corruptions are easy to repair, this + command should provide a way to fix these problems. + + Always create binary backup of header device before running repair, + (only 4kB - visible header) for example by using dd: + dd if=/dev/ of=repair_bck.img bs=1k count=4 + + Then you can try to run repair: + cryptsetup repair + + Note, not all problems are possible to repair and if keyslot or some header + parameters are overwritten, device is lost permanently. + +* Allow to specify --align-payload only for luksFormat. + +* Add --master-key-file option to luksOpen (open using volume key). + +* Support UUID= format for device specification. + You can open device by UUID (only shortcut to /dev/disk/by-uuid/ symlinks). + +* Support password verification with quiet flag if possible. (1.2.0) + Password verification can be still possible if input is terminal. + +* Fix retry if entered passphrases (with verify option) do not match. + (It should retry if requested, not fail.) + +* Fix use of empty keyfile. + +* Fix error message for luksClose and detached LUKS header. + +* Allow --header for status command to get full info with detached header. diff --git a/lib/crypto_backend/crypto_backend.h b/lib/crypto_backend/crypto_backend.h index 75245042..e3fe52fa 100644 --- a/lib/crypto_backend/crypto_backend.h +++ b/lib/crypto_backend/crypto_backend.h @@ -1,3 +1,21 @@ +/* + * crypto backend implementation + * + * Copyright (C) 2010-2012, Red Hat, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #ifndef _CRYPTO_BACKEND_H #define _CRYPTO_BACKEND_H diff --git a/lib/crypto_backend/crypto_gcrypt.c b/lib/crypto_backend/crypto_gcrypt.c index 4475e564..2a63b14c 100644 --- a/lib/crypto_backend/crypto_gcrypt.c +++ b/lib/crypto_backend/crypto_gcrypt.c @@ -1,7 +1,7 @@ /* * GCRYPT crypto backend implementation * - * Copyright (C) 2010-2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2010-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib/crypto_backend/crypto_kernel.c b/lib/crypto_backend/crypto_kernel.c index c6b8066a..38647ac8 100644 --- a/lib/crypto_backend/crypto_kernel.c +++ b/lib/crypto_backend/crypto_kernel.c @@ -1,7 +1,7 @@ /* * Linux kernel userspace API crypto backend implementation * - * Copyright (C) 2010-2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2010-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib/crypto_backend/crypto_nettle.c b/lib/crypto_backend/crypto_nettle.c index 4422a681..585d47f2 100644 --- a/lib/crypto_backend/crypto_nettle.c +++ b/lib/crypto_backend/crypto_nettle.c @@ -1,7 +1,7 @@ /* * Nettle crypto backend implementation * - * Copyright (C) 2011 Red Hat, Inc. All rights reserved. + * Copyright (C) 2011-2012 Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib/crypto_backend/crypto_nss.c b/lib/crypto_backend/crypto_nss.c index 3577de5a..84fbcbc2 100644 --- a/lib/crypto_backend/crypto_nss.c +++ b/lib/crypto_backend/crypto_nss.c @@ -1,7 +1,7 @@ /* * NSS crypto backend implementation * - * Copyright (C) 2010-2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2010-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib/crypto_backend/crypto_openssl.c b/lib/crypto_backend/crypto_openssl.c index f2f9eb9d..0e22394d 100644 --- a/lib/crypto_backend/crypto_openssl.c +++ b/lib/crypto_backend/crypto_openssl.c @@ -1,7 +1,7 @@ /* * OPENSSL crypto backend implementation * - * Copyright (C) 2010-2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2010-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib/internal.h b/lib/internal.h index 85435aa7..75d45332 100644 --- a/lib/internal.h +++ b/lib/internal.h @@ -1,3 +1,24 @@ +/* + * libcryptsetup - cryptsetup library internal + * + * Copyright (C) 2004, Christophe Saout + * Copyright (C) 2004-2007, Clemens Fruhwirth + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef INTERNAL_H #define INTERNAL_H diff --git a/lib/libcryptsetup.h b/lib/libcryptsetup.h index f73c8498..34b76b44 100644 --- a/lib/libcryptsetup.h +++ b/lib/libcryptsetup.h @@ -1,3 +1,24 @@ +/* + * libcryptsetup - cryptsetup library + * + * Copyright (C) 2004, Christophe Saout + * Copyright (C) 2004-2007, Clemens Fruhwirth + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + /** * @file libcryptsetup.h * @brief Public cryptsetup API diff --git a/lib/libdevmapper.c b/lib/libdevmapper.c index d8a62b69..804403d6 100644 --- a/lib/libdevmapper.c +++ b/lib/libdevmapper.c @@ -3,7 +3,7 @@ * * Copyright (C) 2004, Christophe Saout * Copyright (C) 2004-2007, Clemens Fruhwirth - * Copyright (C) 2009-2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib/loopaes/loopaes.c b/lib/loopaes/loopaes.c index 2d491f34..dd61df31 100644 --- a/lib/loopaes/loopaes.c +++ b/lib/loopaes/loopaes.c @@ -1,7 +1,7 @@ /* * loop-AES compatible volume handling * - * Copyright (C) 2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2011-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib/loopaes/loopaes.h b/lib/loopaes/loopaes.h index 5dd0a71b..8f916193 100644 --- a/lib/loopaes/loopaes.h +++ b/lib/loopaes/loopaes.h @@ -1,3 +1,22 @@ +/* + * loop-AES compatible volume handling + * + * Copyright (C) 2011-2012, Red Hat, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef _LOOPAES_H #define _LOOPAES_H diff --git a/lib/luks1/af.c b/lib/luks1/af.c index 9d64915b..8e79f9b4 100644 --- a/lib/luks1/af.c +++ b/lib/luks1/af.c @@ -2,7 +2,7 @@ * AFsplitter - Anti forensic information splitter * * Copyright (C) 2004, Clemens Fruhwirth - * Copyright (C) 2009-2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. * * AFsplitter diffuses information over a large stripe of data, * therefor supporting secure data destruction. diff --git a/lib/luks1/af.h b/lib/luks1/af.h index c6cc8eb3..6687383b 100644 --- a/lib/luks1/af.h +++ b/lib/luks1/af.h @@ -1,10 +1,27 @@ -#ifndef INCLUDED_CRYPTSETUP_LUKS_AF_H -#define INCLUDED_CRYPTSETUP_LUKS_AF_H - /* * AFsplitter - Anti forensic information splitter - * Copyright 2004, Clemens Fruhwirth + * + * Copyright (C) 2004, Clemens Fruhwirth + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. + * + * AFsplitter diffuses information over a large stripe of data, + * therefor supporting secure data destruction. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef INCLUDED_CRYPTSETUP_LUKS_AF_H +#define INCLUDED_CRYPTSETUP_LUKS_AF_H /* * AF_split operates on src and produces information split data in diff --git a/lib/luks1/keyencryption.c b/lib/luks1/keyencryption.c index 680d2e91..98d75651 100644 --- a/lib/luks1/keyencryption.c +++ b/lib/luks1/keyencryption.c @@ -2,6 +2,7 @@ * LUKS - Linux Unified Key Setup * * Copyright (C) 2004-2006, Clemens Fruhwirth + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib/luks1/keymanage.c b/lib/luks1/keymanage.c index 2b573291..d83f7529 100644 --- a/lib/luks1/keymanage.c +++ b/lib/luks1/keymanage.c @@ -2,6 +2,7 @@ * LUKS - Linux Unified Key Setup * * Copyright (C) 2004-2006, Clemens Fruhwirth + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib/luks1/luks.h b/lib/luks1/luks.h index 6a2caaf4..2472d17d 100644 --- a/lib/luks1/luks.h +++ b/lib/luks1/luks.h @@ -1,3 +1,23 @@ +/* + * LUKS - Linux Unified Key Setup + * + * Copyright (C) 2004-2006, Clemens Fruhwirth + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef INCLUDED_CRYPTSETUP_LUKS_LUKS_H #define INCLUDED_CRYPTSETUP_LUKS_LUKS_H diff --git a/lib/luks1/pbkdf.c b/lib/luks1/pbkdf.c index 75fcca2f..0b0c9eed 100644 --- a/lib/luks1/pbkdf.c +++ b/lib/luks1/pbkdf.c @@ -1,10 +1,11 @@ -/* Implementation of Password-Based Cryptography as per PKCS#5 +/* + * Implementation of Password-Based Cryptography as per PKCS#5 * Copyright (C) 2002,2003 Simon Josefsson * Copyright (C) 2004 Free Software Foundation * * LUKS code * Copyright (C) 2004, Clemens Fruhwirth - * Copyright (C) 2009-2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. * * This file is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/lib/luks1/pbkdf.h b/lib/luks1/pbkdf.h index 9bbd8f34..f0d97514 100644 --- a/lib/luks1/pbkdf.h +++ b/lib/luks1/pbkdf.h @@ -1,3 +1,28 @@ +/* + * Implementation of Password-Based Cryptography as per PKCS#5 + * Copyright (C) 2002,2003 Simon Josefsson + * Copyright (C) 2004 Free Software Foundation + * + * LUKS code + * Copyright (C) 2004, Clemens Fruhwirth + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. + * + * This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + #ifndef INCLUDED_CRYPTSETUP_LUKS_PBKDF_H #define INCLUDED_CRYPTSETUP_LUKS_PBKDF_H diff --git a/lib/nls.h b/lib/nls.h index 7ef8a939..39760b14 100644 --- a/lib/nls.h +++ b/lib/nls.h @@ -31,4 +31,4 @@ ( (Count) == 1 ? (Singular) : (Plural) ) #endif -#endif /* CRYPTSETUP_H */ +#endif /* CRYPTSETUP_NLS_H */ diff --git a/lib/random.c b/lib/random.c index 5a6dec00..0f7357a6 100644 --- a/lib/random.c +++ b/lib/random.c @@ -1,7 +1,7 @@ /* * cryptsetup kernel RNG access functions * - * Copyright (C) 2010-2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2010-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib/setup.c b/lib/setup.c index 4bb06314..b4772cea 100644 --- a/lib/setup.c +++ b/lib/setup.c @@ -3,7 +3,7 @@ * * Copyright (C) 2004, Christophe Saout * Copyright (C) 2004-2007, Clemens Fruhwirth - * Copyright (C) 2009-2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib/utils.c b/lib/utils.c index 61e654c9..25f370f4 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -3,7 +3,7 @@ * * Copyright (C) 2004, Christophe Saout * Copyright (C) 2004-2007, Clemens Fruhwirth - * Copyright (C) 2009-2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib/utils_crypt.c b/lib/utils_crypt.c index 683409a1..83ee3766 100644 --- a/lib/utils_crypt.c +++ b/lib/utils_crypt.c @@ -1,8 +1,8 @@ /* - * util_crypt - cipher utilities for cryptsetup + * utils_crypt - cipher utilities for cryptsetup * * Copyright (C) 2004-2007, Clemens Fruhwirth - * Copyright (C) 2009-2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib/utils_crypt.h b/lib/utils_crypt.h index a2bb5be7..1b22b140 100644 --- a/lib/utils_crypt.h +++ b/lib/utils_crypt.h @@ -1,3 +1,23 @@ +/* + * utils_crypt - cipher utilities for cryptsetup + * + * Copyright (C) 2004-2007, Clemens Fruhwirth + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef _UTILS_CRYPT_H #define _UTILS_CRYPT_H diff --git a/lib/utils_debug.c b/lib/utils_debug.c index 1fa7ff41..83e1dc51 100644 --- a/lib/utils_debug.c +++ b/lib/utils_debug.c @@ -4,7 +4,7 @@ * * inspired by psmisc/fuser proc scanning code * - * Copyright (C) 2009-2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib/utils_devpath.c b/lib/utils_devpath.c index f8688f78..31289eef 100644 --- a/lib/utils_devpath.c +++ b/lib/utils_devpath.c @@ -3,7 +3,7 @@ * * Copyright (C) 2004, Christophe Saout * Copyright (C) 2004-2007, Clemens Fruhwirth - * Copyright (C) 2009-2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib/utils_dm.h b/lib/utils_dm.h index b63d1aa2..39e5710c 100644 --- a/lib/utils_dm.h +++ b/lib/utils_dm.h @@ -1,3 +1,24 @@ +/* + * libdevmapper - device-mapper backend for cryptsetup + * + * Copyright (C) 2004, Christophe Saout + * Copyright (C) 2004-2007, Clemens Fruhwirth + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef _UTILS_DM_H #define _UTILS_DM_H diff --git a/lib/utils_loop.c b/lib/utils_loop.c index eb9fbbbd..d0f185b6 100644 --- a/lib/utils_loop.c +++ b/lib/utils_loop.c @@ -1,7 +1,7 @@ /* * loopback block device utilities * - * Copyright (C) 2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2011-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib/utils_loop.h b/lib/utils_loop.h index 13a2d679..0a964b8c 100644 --- a/lib/utils_loop.h +++ b/lib/utils_loop.h @@ -1,3 +1,22 @@ +/* + * loopback block device utilities + * + * Copyright (C) 2011-2012, Red Hat, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef _UTILS_LOOP_H #define _UTILS_LOOP_H diff --git a/lib/utils_wipe.c b/lib/utils_wipe.c index 8db542c1..4cd6583c 100644 --- a/lib/utils_wipe.c +++ b/lib/utils_wipe.c @@ -2,7 +2,7 @@ * utils_wipe - wipe a device * * Copyright (C) 2004-2007, Clemens Fruhwirth - * Copyright (C) 2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2011-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib/volumekey.c b/lib/volumekey.c index 4671771f..f533ad33 100644 --- a/lib/volumekey.c +++ b/lib/volumekey.c @@ -2,7 +2,7 @@ * cryptsetup volume key implementation * * Copyright (C) 2004-2006, Clemens Fruhwirth - * Copyright (C) 2010-2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2010-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/python/pycryptsetup.c b/python/pycryptsetup.c index fb221614..7c6253af 100644 --- a/python/pycryptsetup.c +++ b/python/pycryptsetup.c @@ -1,7 +1,7 @@ /* * Python bindings to libcryptsetup * - * Copyright (C) 2009-2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. * Written by Martin Sivak * * This file is free software; you can redistribute it and/or diff --git a/src/cryptsetup.c b/src/cryptsetup.c index 2730aa78..2f672b85 100644 --- a/src/cryptsetup.c +++ b/src/cryptsetup.c @@ -3,7 +3,7 @@ * * Copyright (C) 2004, Christophe Saout * Copyright (C) 2004-2007, Clemens Fruhwirth - * Copyright (C) 2009-2011, Red Hat, Inc. All rights reserved. + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/src/cryptsetup.h b/src/cryptsetup.h index ceb38c11..41cb2601 100644 --- a/src/cryptsetup.h +++ b/src/cryptsetup.h @@ -1,3 +1,24 @@ +/* + * cryptsetup - setup cryptographic volumes for dm-crypt + * + * Copyright (C) 2004, Christophe Saout + * Copyright (C) 2004-2007, Clemens Fruhwirth + * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef CRYPTSETUP_H #define CRYPTSETUP_H diff --git a/tests/api-test.c b/tests/api-test.c index 442c985c..d39a9bb3 100644 --- a/tests/api-test.c +++ b/tests/api-test.c @@ -1,7 +1,7 @@ /* * cryptsetup library API check functions * - * Copyright (C) 2009-2010 Red Hat, Inc. All rights reserved. + * Copyright (C) 2009-2012 Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/tests/differ.c b/tests/differ.c index 7b586656..e2c66748 100644 --- a/tests/differ.c +++ b/tests/differ.c @@ -1,7 +1,7 @@ /* * cryptsetup file differ check (rewritten Clemens' fileDiffer in Python) * - * Copyright (C) 2010 Red Hat, Inc. All rights reserved. + * Copyright (C) 2010-2012 Red Hat, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License