[git] NTBTLS - branch, master, updated. d7a441e28bd0962030d4bb00f626f56d46315a78
by Werner Koch
cvs at cvs.gnupg.org
Tue Feb 21 15:28:03 CET 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Not Too Bad TLS".
The branch, master has been updated
via d7a441e28bd0962030d4bb00f626f56d46315a78 (commit)
via 8a3e8a9948d7545238d5d0fd54eed43c7c0fb174 (commit)
from 4e4d5a4c436ecf2d2ae96b61b2c0cfc177f585b7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d7a441e28bd0962030d4bb00f626f56d46315a78
Author: Werner Koch <wk at gnupg.org>
Date: Tue Feb 21 15:24:08 2017 +0100
Allow building for W32
--
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/autogen.rc b/autogen.rc
index 1d98c70..a159fb8 100644
--- a/autogen.rc
+++ b/autogen.rc
@@ -1,23 +1,23 @@
# autogen.sh configuration for GnuPG -*- sh -*-
-#version_parts=3
+ersion_parts=3
-# case "$myhost:$myhostsub" in
-# w32:)
-# extraoptions=""
-# ;;
-# esac
+case "$myhost:$myhostsub" in
+ w32:)
+ extraoptions=""
+ ;;
+esac
-# case "$myhost" in
-# w32)
-# configure_opts="
-# --with-gpg-error-prefix=@SYSROOT@
-# --with-ksba-prefix=@SYSROOT@
-# --with-libgcrypt-prefix=@SYSROOT@
-# --with-zlib=@SYSROOT@
-# "
-# ;;
-# esac
+case "$myhost" in
+ w32)
+ configure_opts="
+ --with-gpg-error-prefix=@SYSROOT@
+ --with-ksba-prefix=@SYSROOT@
+ --with-libgcrypt-prefix=@SYSROOT@
+ --with-zlib=@SYSROOT@
+ "
+ ;;
+esac
extra_aclocal_flags=
commit 8a3e8a9948d7545238d5d0fd54eed43c7c0fb174
Author: Werner Koch <wk at gnupg.org>
Date: Tue Feb 21 15:09:21 2017 +0100
Remove now superfluous functions from the public API.
* src/visibility.c (ntbtls_x509_cert_new): Remove
(ntbtls_x509_cert_release): Remove.
(ntbtls_x509_append_cert): Remove.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/AUTHORS b/AUTHORS
index 61d4d02..2abffc3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,9 +1,9 @@
Library: NTBTLS
Homepage: https://gnupg.org/related_software/ntbtls/
-Download: ftp://ftp.gnupg.org/gcrypt/ntbtls/
+Download: https://gnupg.org/ftp/gcrypt/ntbtls/
Repository: git://git.gnupg.org/ntbtls.git
Maintainer: Werner Koch <wk at gnupg.org>
-Bug reports: http://bugs.gnupg.org
+Bug reports: https://bugs.gnupg.org
Security related bug reports: <security at gnupg.org>
License: GPLv3+
@@ -17,14 +17,14 @@ List of Copyright holders
=========================
Copyright (C) 2006-2014 Brainspark B.V.
- Copyright (C) 2014-2015 g10 Code GmbH
+ Copyright (C) 2014-2017 g10 Code GmbH
Authors
==================
Werner Koch <wk at gnupg.org> (g10 Code GmbH)
-2014-10-01::Initial work
+NIIBE Yutaka <gniibe at fsij.org>
diff --git a/NEWS b/NEWS
index 17027a1..f760120 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
Noteworthy changes in version 0.1.0 (unreleased) [C0/A0/R0]
------------------------------------------------
- * Initial beta release
+ * Initial experimental release with only the client code.
See the file AUTHORS for copying conditions.
diff --git a/configure.ac b/configure.ac
index 6cb2bd5..cfd8905 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
# configure.ac - for the Not Too Bad TLS library
-# Copyright (C) 2014 g10 Code GmbH
+# Copyright (C) 2014-2017 g10 Code GmbH
#
# This file is part of NTBTLS
#
diff --git a/src/context.h b/src/context.h
index 4934c6e..aac3017 100644
--- a/src/context.h
+++ b/src/context.h
@@ -94,6 +94,20 @@ typedef enum
/*
+ * Object to hold X.509 certificates.
+ */
+struct x509_cert_s;
+typedef struct x509_cert_s *x509_cert_t;
+
+
+/*
+ * Object to hold an X.509 CRL.
+ */
+struct x509_crl_s;
+typedef struct x509_crl_s *x509_crl_t;
+
+
+/*
* Object to hold an X.509 private key.
*/
struct x509_privkey_s;
diff --git a/src/libntbtls.def b/src/libntbtls.def
index 8526d10..fe6e0fd 100644
--- a/src/libntbtls.def
+++ b/src/libntbtls.def
@@ -23,23 +23,20 @@
EXPORTS
ntbtls_check_version @1
ntbtls_set_debug @2
+ ntbtls_set_log_handler @3
- ntbtls_new @3
- ntbtls_release @4
- ntbtls_set_transport @5
- ntbtls_get_stream @6
- ntbtls_set_hostname @7
+ ntbtls_new @4
+ _ntbtls_check_context @5
+ ntbtls_release @6
- ntbtls_handshake @8
+ ntbtls_set_transport @7
+ ntbtls_get_stream @8
+ ntbtls_set_hostname @9
+ ntbtls_get_hostname @10
+ ntbtls_set_verify_cb @11
- ntbtls_set_verify_cb @9
-
- ntbtls_x509_cert_new @10
- ntbtls_x509_cert_release @11
- ntbtls_x509_append_cert @12
+ ntbtls_handshake @12
ntbtls_x509_get_peer_cert @13
- ntbtls_set_log_handler @14
- ntbtls_get_hostname @15
- _ntbtls_check_context @16
+
; END
diff --git a/src/libntbtls.vers b/src/libntbtls.vers
index fa0b175..48d7662 100644
--- a/src/libntbtls.vers
+++ b/src/libntbtls.vers
@@ -28,18 +28,15 @@ NTBTLS_1.0 {
ntbtls_new;
_ntbtls_check_context;
ntbtls_release;
+
ntbtls_set_transport;
ntbtls_get_stream;
ntbtls_set_hostname;
ntbtls_get_hostname;
+ ntbtls_set_verify_cb;
ntbtls_handshake;
- ntbtls_set_verify_cb;
-
- ntbtls_x509_cert_new;
- ntbtls_x509_cert_release;
- ntbtls_x509_append_cert;
ntbtls_x509_get_peer_cert;
local:
diff --git a/src/ntbtls.h.in b/src/ntbtls.h.in
index f628698..6262cfb 100644
--- a/src/ntbtls.h.in
+++ b/src/ntbtls.h.in
@@ -1,5 +1,5 @@
/* ntbtls.h - Not Too Bad TLS -*- c -*-
- * Copyright (C) 2014 g10 Code GmbH
+ * Copyright (C) 2014, 2017 g10 Code GmbH
*
* This file is part of NTBTLS
*
@@ -55,18 +55,6 @@ struct _ntbtls_context_s;
typedef struct _ntbtls_context_s *ntbtls_t;
/*
- * Object to hold X.509 certificates.
- */
-struct x509_cert_s;
-typedef struct x509_cert_s *x509_cert_t;
-
-/*
- * Object to hold an X.509 CRL.
- */
-struct x509_crl_s;
-typedef struct x509_crl_s *x509_crl_t;
-
-/*
* The type of the verification callback. This must be registered
* prior to the handshake and will be called by ntbltls when a peer's
* certificate needs to be verified. OPAQUE is the vale set when the
@@ -105,16 +93,6 @@ void ntbtls_release (ntbtls_t tls);
gpg_error_t _ntbtls_check_context (ntbtls_t tls, const char *file, int line);
#define ntbtls_check_context(t) _ntbtls_check_context ((t), __FILE__, __LINE__)
-/* Create a new X509 certificate chain. */
-gpg_error_t ntbtls_x509_cert_new (x509_cert_t *r_cert);
-
-/* Destroy a X509 certificate chain. */
-void ntbtls_x509_cert_release (x509_cert_t cert);
-
-/* Parse a single DER formatted certificate and add it to the chained list. */
-gpg_error_t ntbtls_x509_append_cert (x509_cert_t cert, const void *der,
- size_t derlen);
-
/* Setup the transport streams (usually connected to one socket). */
gpg_error_t ntbtls_set_transport (ntbtls_t tls,
gpgrt_stream_t inbound,
diff --git a/src/protocol.c b/src/protocol.c
index a931cd0..f736894 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -1,6 +1,6 @@
/* protocol.c - TLS 1.2 protocol implementation
* Copyright (C) 2006-2014, Brainspark B.V.
- * Copyright (C) 2014 g10 code GmbH
+ * Copyright (C) 2014, 2017 g10 code GmbH
*
* This file is part of NTBTLS
*
diff --git a/src/util.h b/src/util.h
index 98a8392..4f37f3b 100644
--- a/src/util.h
+++ b/src/util.h
@@ -58,6 +58,10 @@
#define OID_SIZE(x) (sizeof(x) - 1)
+struct x509_cert_s;
+typedef struct x509_cert_s *x509_cert_t;
+
+
/* Constant-time compare of two buffers. Returns 0 if buffers are
equal, and 1 if buffers differ. At most places this function can
be used as a memcmp replacement. However, -1 will never be
diff --git a/src/versioninfo.rc.in b/src/versioninfo.rc.in
index afbbe02..5fccc83 100644
--- a/src/versioninfo.rc.in
+++ b/src/versioninfo.rc.in
@@ -39,7 +39,7 @@ BEGIN
VALUE "FileDescription", "ntbtls - Not Too Bad Transport Layer Security\0"
VALUE "FileVersion", "@LIBNTBTLS_LT_CURRENT at .@LIBNTBTLS_LT_AGE at .@LIBNTBTLS_LT_REVISION at .@BUILD_REVISION@\0"
VALUE "InternalName", "libntbtls\0"
- VALUE "LegalCopyright", "Copyright © 2006-2014 Brainspark B.V., Copyright © 2014-2015 g10 Code GmbH\0"
+ VALUE "LegalCopyright", "Copyright © 2006-2014 Brainspark B.V., Copyright © 2014-2017 g10 Code GmbH\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libntbtls.dll\0"
VALUE "PrivateBuild", "\0"
diff --git a/src/visibility.c b/src/visibility.c
index 40cb3ee..7f0e50e 100644
--- a/src/visibility.c
+++ b/src/visibility.c
@@ -117,27 +117,6 @@ ntbtls_set_verify_cb (ntbtls_t tls, ntbtls_verify_cb_t cb, void *cb_value)
return _ntbtls_set_verify_cb (tls, cb, cb_value);
}
-
-gpg_error_t
-ntbtls_x509_cert_new (x509_cert_t *r_cert)
-{
- return _ntbtls_x509_cert_new (r_cert);
-}
-
-
-void
-ntbtls_x509_cert_release (x509_cert_t cert)
-{
- _ntbtls_x509_cert_release (cert);
-}
-
-
-gpg_error_t
-ntbtls_x509_append_cert (x509_cert_t cert, const void *der, size_t derlen)
-{
- return _ntbtls_x509_append_cert (cert, der, derlen);
-}
-
ksba_cert_t
ntbtls_x509_get_peer_cert (ntbtls_t tls, int idx)
{
diff --git a/src/visibility.h b/src/visibility.h
index 8ac6c9e..d411126 100644
--- a/src/visibility.h
+++ b/src/visibility.h
@@ -52,12 +52,7 @@ MARK_VISIBLE (ntbtls_get_stream)
MARK_VISIBLE (ntbtls_set_hostname)
MARK_VISIBLE (ntbtls_get_hostname)
MARK_VISIBLE (ntbtls_handshake)
-
MARK_VISIBLE (ntbtls_set_verify_cb)
-
-MARK_VISIBLE (ntbtls_x509_cert_new)
-MARK_VISIBLE (ntbtls_x509_cert_release)
-MARK_VISIBLE (ntbtls_x509_append_cert)
MARK_VISIBLE (ntbtls_x509_get_peer_cert)
@@ -78,11 +73,7 @@ MARK_VISIBLE (ntbtls_x509_get_peer_cert)
#define ntbtls_set_hostname _ntbtls_USE_THE_UNDERSCORED_FUNCTION
#define ntbtls_get_hostname _ntbtls_USE_THE_UNDERSCORED_FUNCTION
#define ntbtls_handshake _ntbtls_USE_THE_UNDERSCORED_FUNCTION
-
#define ntbtls_set_verify_cb _ntbtls_USE_THE_UNDERSCORED_FUNCTION
-#define ntbtls_x509_cert_new _ntbtls_USE_THE_UNDERSCORED_FUNCTION
-#define ntbtls_x509_cert_release _ntbtls_USE_THE_UNDERSCORED_FUNCTION
-#define ntbtls_x509_append_cert _ntbtls_USE_THE_UNDERSCORED_FUNCTION
#define ntbtls_x509_get_peer_cert _ntbtls_USE_THE_UNDERSCORED_FUNCTION
#endif /*!_NTBTLS_INCLUDED_BY_VISIBILITY_C*/
diff --git a/src/x509.c b/src/x509.c
index f948b9c..6e7b967 100644
--- a/src/x509.c
+++ b/src/x509.c
@@ -1,5 +1,5 @@
/* x509.c - X.509 functions
- * Copyright (C) 2001-2010, 2014-2015 g10 Code GmbH
+ * Copyright (C) 2001-2010, 2014-2015, 2017 g10 Code GmbH
*
* This file is part of NTBTLS
*
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 8 ++++----
NEWS | 2 +-
autogen.rc | 32 ++++++++++++++++----------------
configure.ac | 2 +-
src/context.h | 14 ++++++++++++++
src/libntbtls.def | 25 +++++++++++--------------
src/libntbtls.vers | 7 ++-----
src/ntbtls.h.in | 24 +-----------------------
src/protocol.c | 2 +-
src/util.h | 4 ++++
src/versioninfo.rc.in | 2 +-
src/visibility.c | 21 ---------------------
src/visibility.h | 9 ---------
src/x509.c | 2 +-
14 files changed, 57 insertions(+), 97 deletions(-)
hooks/post-receive
--
Not Too Bad TLS
http://git.gnupg.org
More information about the Gnupg-commits
mailing list