diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/Makefile.am | 6 | ||||
| -rw-r--r-- | g10/basicdefs.h | 40 |
3 files changed, 46 insertions, 5 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index b5ded0c28..c7c3dc204 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +Tue Oct 26 20:03:44 CEST 1999 Werner Koch <[email protected]> + + * Makefile.am (basicdefs.h): Added. + (install-data-local): Removed the handling for historic gpgm. + Tue Oct 26 14:10:21 CEST 1999 Werner Koch <[email protected]> * misc.c (openpgp_cipher_test_algo): New. diff --git a/g10/Makefile.am b/g10/Makefile.am index d2fd427c0..8e0ac443f 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -13,6 +13,7 @@ bin_PROGRAMS = gpg common_source = \ build-packet.c \ compress.c \ + basicdefs.h \ filter.h \ free-packet.c \ getkey.c \ @@ -86,9 +87,4 @@ install-data-local: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) $(INSTALL_DATA) $(srcdir)/options.skel \ $(DESTDIR)$(pkgdatadir)/options.skel - @set -e;\ - if test -f $(DESTDIR)$(bindir)/gpgm ; then \ - echo "removing obsolete gpgm binary" ; \ - rm $(DESTDIR)$(bindir)/gpgm ; \ - fi diff --git a/g10/basicdefs.h b/g10/basicdefs.h new file mode 100644 index 000000000..9e1edb56d --- /dev/null +++ b/g10/basicdefs.h @@ -0,0 +1,40 @@ +/* basicdefs.h - Some definitions used at many place + * Copyright (C) 1999 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * 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. + * + * 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. + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#ifndef G10_BASICDEFS_H +#define G10_BASICDEFS_H + +#include "types.h" + +typedef struct { + int algo; + int keylen; + byte key[32]; /* this is the largest used keylen (256 bit) */ +} DEK; + + +struct pk_list; +struct sk_list; +typedef struct pk_list *PK_LIST; +typedef struct sk_list *SK_LIST; + + + +#endif /* G10_BASICDEFS_H */ |