gnutls-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-290-gc31afb3


From: Nikos Mavrogiannopoulos
Subject: [SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-290-gc31afb3
Date: Sat, 03 Jul 2010 17:44:49 +0000

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 "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=c31afb30c2d030c2d865f7d3a6a60118315ac8d1

The branch, master has been updated
       via  c31afb30c2d030c2d865f7d3a6a60118315ac8d1 (commit)
       via  1b43c9e388ace6e65e4386324c703582ddb53024 (commit)
      from  671f50958c0cdeebb528df0e8c54a281eaddf9dd (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 c31afb30c2d030c2d865f7d3a6a60118315ac8d1
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jul 3 19:44:37 2010 +0200

    Fixed to compile under mingw32.

commit 1b43c9e388ace6e65e4386324c703582ddb53024
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jul 3 19:20:52 2010 +0200

    only warn if dlopen or pthreads are not found.

-----------------------------------------------------------------------

Summary of changes:
 lib/gcrypt/Makefile.am |    4 ++++
 lib/gnutls_privkey.c   |   12 ++++++++++++
 lib/gnutls_pubkey.c    |    3 +++
 lib/m4/hooks.m4        |    4 ++--
 lib/nettle/Makefile.am |    4 ++++
 lib/pakchois/dlopen.h  |    3 +++
 6 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/lib/gcrypt/Makefile.am b/lib/gcrypt/Makefile.am
index 0b3d574..5a78b92 100644
--- a/lib/gcrypt/Makefile.am
+++ b/lib/gcrypt/Makefile.am
@@ -29,6 +29,10 @@ AM_CPPFLAGS = \
        -I$(builddir)/../includes       \
        -I$(srcdir)/..
 
+if ENABLE_MINITASN1
+AM_CPPFLAGS += -I$(srcdir)/../minitasn1
+endif
+
 noinst_LTLIBRARIES = libcrypto.la
 
 libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c
diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index c61567b..f5efe6d 100644
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -42,7 +42,9 @@ struct gnutls_privkey_st {
        union {
                gnutls_x509_privkey_t x509;
                gnutls_pkcs11_privkey_t pkcs11;
+#ifdef ENABLE_OPENPGP
                gnutls_openpgp_privkey_t openpgp;
+#endif
        } key;
 
        unsigned int flags;
@@ -79,10 +81,12 @@ int gnutls_privkey_get_pk_algorithm(gnutls_privkey_t key,
                                    unsigned int *bits)
 {
        switch (key->type) {
+#ifdef ENABLE_OPENPGP
        case GNUTLS_PRIVKEY_OPENPGP:
                return gnutls_openpgp_privkey_get_pk_algorithm(key->key.
                                                               openpgp,
                                                               bits);
+#endif
        case GNUTLS_PRIVKEY_PKCS11:
                return gnutls_pkcs11_privkey_get_pk_algorithm(key->key.
                                                              pkcs11,
@@ -130,9 +134,11 @@ void gnutls_privkey_deinit(gnutls_privkey_t key)
 {
        if (key->flags & GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE)
                switch (key->type) {
+#ifdef ENABLE_OPENPGP
                case GNUTLS_PRIVKEY_OPENPGP:
                        return gnutls_openpgp_privkey_deinit(key->key.
                                                             openpgp);
+#endif
                case GNUTLS_PRIVKEY_PKCS11:
                        return gnutls_pkcs11_privkey_deinit(key->key.
                                                            pkcs11);
@@ -191,6 +197,7 @@ int gnutls_privkey_import_x509(gnutls_privkey_t pkey,
        return 0;
 }
 
+#ifdef ENABLE_OPENPGP
 /**
  * gnutls_privkey_import_openpgp:
  * @pkey: The private key
@@ -215,6 +222,7 @@ int gnutls_privkey_import_openpgp(gnutls_privkey_t pkey,
 
        return 0;
 }
+#endif
 
 /**
  * gnutls_privkey_sign_data:
@@ -291,9 +299,11 @@ int gnutls_privkey_sign_hash(gnutls_privkey_t key,
                             gnutls_datum_t * signature)
 {
        switch (key->type) {
+#ifdef ENABLE_OPENPGP
        case GNUTLS_PRIVKEY_OPENPGP:
                return gnutls_openpgp_privkey_sign_hash(key->key.openpgp,
                                                        hash, signature);
+#endif
        case GNUTLS_PRIVKEY_PKCS11:
                return gnutls_pkcs11_privkey_sign_hash(key->key.pkcs11,
                                                       hash, signature);
@@ -330,11 +340,13 @@ int gnutls_privkey_decrypt_data(gnutls_privkey_t key,
        }
 
        switch (key->type) {
+#ifdef ENABLE_OPENPGP
        case GNUTLS_PRIVKEY_OPENPGP:
                return gnutls_openpgp_privkey_decrypt_data(key->key.
                                                           openpgp, flags,
                                                           ciphertext,
                                                           plaintext);
+#endif
        case GNUTLS_PRIVKEY_X509:
                return _gnutls_pkcs1_rsa_decrypt(plaintext, ciphertext,
                                                 key->key.x509->params,
diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c
index f1740bb..2460eca 100644
--- a/lib/gnutls_pubkey.c
+++ b/lib/gnutls_pubkey.c
@@ -268,6 +268,7 @@ int gnutls_pubkey_import_pkcs11(gnutls_pubkey_t key,
        return 0;
 }
 
+#ifdef ENABLE_OPENPGP
 /**
  * gnutls_pubkey_import_openpgp:
  * @key: The public key
@@ -330,6 +331,8 @@ int gnutls_pubkey_import_openpgp(gnutls_pubkey_t key,
        return 0;
 }
 
+#endif
+
 /**
  * gnutls_pubkey_export:
  * @key: Holds the certificate
diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index 934c3be..378c94a 100644
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -115,9 +115,9 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   AM_CONDITIONAL(ENABLE_LOCAL_PAKCHOIS, test "$included_pakchois" = "yes")
   if test "$included_pakchois" = "yes";then
        AC_CHECK_LIB(pthread, pthread_mutex_lock,,
-          [AC_MSG_ERROR([could not find pthread_mutex_lock])])
+          [AC_MSG_WARN([could not find pthread_mutex_lock])])
        AC_CHECK_LIB(dl, dlopen,,
-          [AC_MSG_ERROR([could not find dlopen])])
+          [AC_MSG_WARN([could not find dlopen])])
 
   fi
 
diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
index 0b3d574..5a78b92 100644
--- a/lib/nettle/Makefile.am
+++ b/lib/nettle/Makefile.am
@@ -29,6 +29,10 @@ AM_CPPFLAGS = \
        -I$(builddir)/../includes       \
        -I$(srcdir)/..
 
+if ENABLE_MINITASN1
+AM_CPPFLAGS += -I$(srcdir)/../minitasn1
+endif
+
 noinst_LTLIBRARIES = libcrypto.la
 
 libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c
diff --git a/lib/pakchois/dlopen.h b/lib/pakchois/dlopen.h
index b1385fd..a8a5fab 100644
--- a/lib/pakchois/dlopen.h
+++ b/lib/pakchois/dlopen.h
@@ -5,6 +5,9 @@
 
 #ifdef _WIN32
 
+#define RTLD_LOCAL 0
+#define RTLD_NOW 1
+
 void *dlopen(const char *filename, int flag);
 void *dlsym(void *handle, const char *symbol);
 int dlclose(void *handle);


hooks/post-receive
-- 
GNU gnutls



reply via email to

[Prev in Thread] Current Thread [Next in Thread]