diff options
Diffstat (limited to 'g10/keydb.h')
| -rw-r--r-- | g10/keydb.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/g10/keydb.h b/g10/keydb.h index eff603a04..7f49f3545 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -1,14 +1,14 @@ /* keydb.h - Key database - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GNUPG. * - * G10 is free software; you can redistribute it and/or modify + * GNUPG is free software; you can redistribute it and/or modify * 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. * - * G10 is distributed in the hope that it will be useful, + * GNUPG 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. @@ -95,8 +95,8 @@ int build_skc_list( STRLIST locusr, SKC_LIST *ret_skc_list, int unlock ); /*-- passphrase.h --*/ void set_passphrase_fd( int fd ); int get_passphrase_fd(void); -DEK *get_passphrase_hash( u32 *keyid, char *text ); -int make_dek_from_passphrase( DEK *dek, int mode ); +DEK *get_passphrase_hash( u32 *keyid, char *text, byte *salt ); +int make_dek_from_passphrase( DEK *dek, int mode, byte *salt ); /*-- getkey.c --*/ void add_keyring( const char *name ); |