* (c) 1999 Mark Wooding
*/
-/*----- Licensing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------*
*
* This file is part of Catacomb.
*
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* Catacomb 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 Catacomb; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
/* --- Unlock the key --- */
- kp.kd.e = KENC_BINARY;
+ kp.e = KENC_BINARY;
kp.p = &kb;
- if ((e = key_unpack(&kp, &k->k, &t)) != 0) {
+ if ((e = key_unpack(&kp, k->k, &t)) != 0) {
die(EXIT_FAILURE, "error unpacking key `%s': %s",
t.buf, key_strerror(e));
}
dstr d = DSTR_INIT;
octet buf[COOKIE_SZ];
base64_ctx b;
-
+
/* --- Various useful flag bits --- */
#define f_bogus 1u
case 'm':
if (!(minbits = atoi(optarg)) || minbits % 8)
die(EXIT_FAILURE, "bad number of bits: `%s'", optarg);
- break;
+ break;
/* --- Miscellaneous flags --- */
case 'v':
v++;
break;
-
+
/* --- Other things are bogus --- */
default:
#undef f_bogus
#undef f_forever
-}
+}
/*----- That's all, folks -------------------------------------------------*/