summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2006-08-16 12:47:53 +0200
committerWerner Koch <wk@gnupg.org>2006-08-16 12:47:53 +0200
commitb744f963d7061ce55d2eed65b281298476e54fb7 (patch)
tree6e8ccb3c39a45c16b4ca6cdb2273eb3b8bc2a888 /include
parentChanged HTTP API. (diff)
downloadgnupg2-b744f963d7061ce55d2eed65b281298476e54fb7.tar.xz
gnupg2-b744f963d7061ce55d2eed65b281298476e54fb7.zip
With --enable-gpg the keyservers are now build and a first test using gpg2
shows no prblems. Needs more testing of course.
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog5
-rw-r--r--include/distfiles1
-rw-r--r--include/http.h3
-rw-r--r--include/keyserver.h44
4 files changed, 8 insertions, 45 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 3fd3fe48c..e1eada9a9 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-16 Werner Koch <wk@g10code.com>
+
+ * keyserver.h: Moved to ../common.
+ * http.h: Retired.
+
2006-04-28 Werner Koch <wk@g10code.com>
* cipher.h (DIGEST_ALGO_SHA224): Define it.
diff --git a/include/distfiles b/include/distfiles
index b11749d78..0f58e614d 100644
--- a/include/distfiles
+++ b/include/distfiles
@@ -7,7 +7,6 @@ util.h
i18n.h
host2net.h
http.h
-keyserver.h
_regex.h
ChangeLog
diff --git a/include/http.h b/include/http.h
index b9ce5b130..2fd64c288 100644
--- a/include/http.h
+++ b/include/http.h
@@ -23,6 +23,9 @@
#ifndef G10_HTTP_H
#define G10_HTTP_H 1
+#error this file should not be used anymore
+
+
#include "../common/iobuf.h"
struct uri_tuple {
diff --git a/include/keyserver.h b/include/keyserver.h
deleted file mode 100644
index 7bd12625e..000000000
--- a/include/keyserver.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* keyserver.h
- * Copyright (C) 2001, 2002 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- */
-
-#ifndef _KEYSERVER_H_
-#define _KEYSERVER_H_
-
-#define KEYSERVER_PROTO_VERSION 1
-
-/* These are usable for return codes for the gpgkeys_ process, and
- also KEY FAILED codes. */
-#define KEYSERVER_OK 0 /* not an error */
-#define KEYSERVER_INTERNAL_ERROR 1 /* gpgkeys_ internal error */
-#define KEYSERVER_NOT_SUPPORTED 2 /* operation not supported */
-#define KEYSERVER_VERSION_ERROR 3 /* VERSION mismatch */
-#define KEYSERVER_GENERAL_ERROR 4 /* keyserver internal error */
-#define KEYSERVER_NO_MEMORY 5 /* out of memory */
-#define KEYSERVER_KEY_NOT_FOUND 6 /* key not found */
-#define KEYSERVER_KEY_EXISTS 7 /* key already exists */
-#define KEYSERVER_KEY_INCOMPLETE 8 /* key incomplete (EOF) */
-#define KEYSERVER_UNREACHABLE 9 /* unable to contact keyserver */
-#define KEYSERVER_TIMEOUT 10 /* timeout while accessing keyserver */
-
-/* Must be 127 due to shell internal magic. */
-#define KEYSERVER_SCHEME_NOT_FOUND 127
-
-#endif /* !_KEYSERVER_H_ */