Skip to content

Commit 0ebd23f

Browse files
committed
Migrated more stuff to doc/
Migrated the gpg regression tests. Some changes tp the gpg code to fix bugs and for the use in testing. make distcheck works now with gpg enabled.
1 parent b122c9b commit 0ebd23f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+9634
-119
lines changed

ChangeLog

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2006-08-21 Werner Koch <[email protected]>
2+
3+
* configure.ac: Removed docbook tests.
4+
(AC_CONFIG_FILES): Added gpgkeys_test and gpgkeys_mailto.
5+
6+
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Enable gpg.
7+
18
2006-08-17 Werner Koch <[email protected]>
29

310
* THANKS: Merged with the 1.4 one.

Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
ACLOCAL_AMFLAGS = -I m4 -I gl/m4
2424
AUTOMAKE_OPTIONS = dist-bzip2
25+
DISTCHECK_CONFIGURE_FLAGS = --enable-gpg
2526

2627
EXTRA_DIST = scripts/config.rpath autogen.sh README.CVS
2728
DISTCLEANFILES = g10defs.h

THANKS

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Anthony Mulcahy anthony at kcn.ne.jp
1717
Ariel T Glenn ariel at columbia.edu
1818
Bernhard Herzog bh at intevation.de
1919
Bernhard Reiter bernhard de intevation.de
20+
Bob Dunlop bob at xyzzy.org.uk
2021
Bob Mathews bobmathews at mindspring.com
2122
Bodo Moeller Bodo_Moeller at public.uni-hamburg.de
2223
Brendan O'Dea bod at debian.org

TODO

+3
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ might want to have an agent context for each service request
115115
Remove the whole stuff?
116116
** qbits
117117
We pass a new qbit parameter to genkey - implement this in libgcrypt.
118+
** skclist.c
119+
As soon as we switch to libgcrypt 1.3 we should remove the hard
120+
coded constant in random_is_faked.
118121

119122

120123
* common/

common/ChangeLog

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2006-08-21 Werner Koch <[email protected]>
2+
3+
* Makefile.am (libcommon_a_SOURCES): Added keyserver.h
4+
5+
* openpgpdefs.h: New. Stripped from ..g10/packet.h.
6+
17
2006-08-16 Werner Koch <[email protected]>
28

39
* keyserver.h: Moved from ../include to here.

common/Makefile.am

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(KSBA_CFLAGS) \
3030
libcommon_a_SOURCES = \
3131
util.h i18n.h \
3232
errors.h \
33+
openpgpdefs.h \
34+
keyserver.h \
3335
sexp-parse.h \
3436
sexputil.c \
3537
maperror.c \
@@ -56,7 +58,6 @@ libcommon_a_SOURCES = \
5658
pka.c pka.h \
5759
http.c http.h
5860

59-
6061
libsimple_pwquery_a_SOURCES = \
6162
simple-pwquery.c simple-pwquery.h asshelp.c asshelp.h
6263

common/openpgpdefs.h

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
/* openpgpdefs.h - Constants from the OpenPGP standard (rfc2440)
2+
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
3+
* 2006 Free Software Foundation, Inc.
4+
*
5+
* This file is part of GnuPG.
6+
*
7+
* GnuPG is free software; you can redistribute it and/or modify
8+
* it under the terms of the GNU General Public License as published by
9+
* the Free Software Foundation; either version 2 of the License, or
10+
* (at your option) any later version.
11+
*
12+
* GnuPG is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
* GNU General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU General Public License
18+
* along with this program; if not, write to the Free Software
19+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
20+
* USA.
21+
*/
22+
23+
#ifndef GNUPG_COMMON_OPENPGPDEFS_H
24+
#define GNUPG_COMMON_OPENPGPDEFS_H
25+
26+
typedef enum
27+
{
28+
PKT_NONE = 0,
29+
PKT_PUBKEY_ENC = 1, /* Public key encrypted packet. */
30+
PKT_SIGNATURE = 2, /* Secret key encrypted packet. */
31+
PKT_SYMKEY_ENC = 3, /* Session key packet. */
32+
PKT_ONEPASS_SIG = 4, /* One pass sig packet. */
33+
PKT_SECRET_KEY = 5, /* Secret key. */
34+
PKT_PUBLIC_KEY = 6, /* Public key. */
35+
PKT_SECRET_SUBKEY = 7, /* Secret subkey. */
36+
PKT_COMPRESSED = 8, /* Compressed data packet. */
37+
PKT_ENCRYPTED = 9, /* Conventional encrypted data. */
38+
PKT_MARKER = 10, /* Marker packet. */
39+
PKT_PLAINTEXT = 11, /* Literal data packet. */
40+
PKT_RING_TRUST = 12, /* Keyring trust packet. */
41+
PKT_USER_ID = 13, /* User id packet. */
42+
PKT_PUBLIC_SUBKEY = 14, /* Public subkey. */
43+
PKT_OLD_COMMENT = 16, /* Comment packet from an OpenPGP draft. */
44+
PKT_ATTRIBUTE = 17, /* PGP's attribute packet. */
45+
PKT_ENCRYPTED_MDC = 18, /* Integrity protected encrypted data. */
46+
PKT_MDC = 19, /* Manipulation detection code packet. */
47+
PKT_COMMENT = 61, /* new comment packet (GnuPG specific). */
48+
PKT_GPG_CONTROL = 63 /* internal control packet (GnuPG specific). */
49+
}
50+
pkttype_t;
51+
52+
53+
typedef enum
54+
{
55+
SIGSUBPKT_TEST_CRITICAL = -3,
56+
SIGSUBPKT_LIST_UNHASHED = -2,
57+
SIGSUBPKT_LIST_HASHED = -1,
58+
SIGSUBPKT_NONE = 0,
59+
SIGSUBPKT_SIG_CREATED = 2, /* Signature creation time. */
60+
SIGSUBPKT_SIG_EXPIRE = 3, /* Signature expiration time. */
61+
SIGSUBPKT_EXPORTABLE = 4, /* Exportable. */
62+
SIGSUBPKT_TRUST = 5, /* Trust signature. */
63+
SIGSUBPKT_REGEXP = 6, /* Regular expression. */
64+
SIGSUBPKT_REVOCABLE = 7, /* Revocable. */
65+
SIGSUBPKT_KEY_EXPIRE = 9, /* Key expiration time. */
66+
SIGSUBPKT_ARR = 10, /* Additional recipient request. */
67+
SIGSUBPKT_PREF_SYM = 11, /* Preferred symmetric algorithms. */
68+
SIGSUBPKT_REV_KEY = 12, /* Revocation key. */
69+
SIGSUBPKT_ISSUER = 16, /* Issuer key ID. */
70+
SIGSUBPKT_NOTATION = 20, /* Notation data. */
71+
SIGSUBPKT_PREF_HASH = 21, /* Preferred hash algorithms. */
72+
SIGSUBPKT_PREF_COMPR = 22, /* Preferred compression algorithms. */
73+
SIGSUBPKT_KS_FLAGS = 23, /* Key server preferences. */
74+
SIGSUBPKT_PREF_KS = 24, /* Preferred key server. */
75+
SIGSUBPKT_PRIMARY_UID = 25, /* Primary user id. */
76+
SIGSUBPKT_POLICY = 26, /* Policy URL. */
77+
SIGSUBPKT_KEY_FLAGS = 27, /* Key flags. */
78+
SIGSUBPKT_SIGNERS_UID = 28, /* Signer's user id. */
79+
SIGSUBPKT_REVOC_REASON = 29, /* Reason for revocation. */
80+
SIGSUBPKT_FEATURES = 30, /* Feature flags. */
81+
82+
SIGSUBPKT_SIGNATURE = 32, /* Embedded signature. */
83+
84+
SIGSUBPKT_FLAG_CRITICAL = 128
85+
}
86+
sigsubpkttype_t;
87+
88+
89+
#endif /*GNUPG_COMMON_OPENPGPDEFS_H*/

configure.ac

+4-3
Original file line numberDiff line numberDiff line change
@@ -442,10 +442,7 @@ AC_PATH_PROG(PERL,"perl")
442442
AC_ISC_POSIX
443443
gl_EARLY
444444
AC_SYS_LARGEFILE
445-
AC_CHECK_PROG(DOCBOOK_TO_MAN, docbook-to-man, yes, no)
446-
AM_CONDITIONAL(HAVE_DOCBOOK_TO_MAN, test "$ac_cv_prog_DOCBOOK_TO_MAN" = yes)
447445
GNUPG_CHECK_FAQPROG
448-
GNUPG_CHECK_DOCBOOK_TO_TEXI
449446
GNUPG_CHECK_USTAR
450447

451448

@@ -1312,9 +1309,13 @@ sm/Makefile
13121309
agent/Makefile
13131310
scd/Makefile
13141311
keyserver/Makefile
1312+
keyserver/gpgkeys_mailto
1313+
keyserver/gpgkeys_test
1314+
tools/gpg-zip
13151315
tools/Makefile
13161316
doc/Makefile
13171317
tests/Makefile
1318+
tests/openpgp/Makefile
13181319
])
13191320
AC_OUTPUT
13201321

doc/ChangeLog

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2006-08-21 Werner Koch <[email protected]>
2+
3+
* Makefile.am: Added other doc files from gpg 1.4.
4+
15
2006-08-17 Werner Koch <[email protected]>
26

37
* Makefile.am: Added rules to build man pages.

0 commit comments

Comments
 (0)