[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, gnutls_2_8_x, updated. gnutls_2_8_6-6-g307f5c0
From: |
Nikos Mavrogiannopoulos |
Subject: |
[SCM] GNU gnutls branch, gnutls_2_8_x, updated. gnutls_2_8_6-6-g307f5c0 |
Date: |
Sat, 26 Jun 2010 19:54:42 +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=307f5c0e237bd3a73a22bfb53f049cb9d5ce25f4
The branch, gnutls_2_8_x has been updated
via 307f5c0e237bd3a73a22bfb53f049cb9d5ce25f4 (commit)
from e72dcf4095adad4811aa440ff44d272d633cdf9d (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 307f5c0e237bd3a73a22bfb53f049cb9d5ce25f4
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sat Jun 26 21:54:36 2010 +0200
Revert "When generating private key allow usage of --pkcs-cipher flag."
This reverts commit e72dcf4095adad4811aa440ff44d272d633cdf9d.
-----------------------------------------------------------------------
Summary of changes:
src/certtool.c | 31 +------------------------------
1 files changed, 1 insertions(+), 30 deletions(-)
diff --git a/src/certtool.c b/src/certtool.c
index a5890bf..5693cf2 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -195,35 +195,6 @@ generate_private_key_int (void)
return key;
}
-static int
-cipher_to_flags (const char *cipher)
-{
- if (strcasecmp (cipher, "3des") == 0)
- {
- return GNUTLS_PKCS_USE_PBES2_3DES;
- }
- else if (strcasecmp (cipher, "aes-128") == 0)
- {
- return GNUTLS_PKCS_USE_PBES2_AES_128;
- }
- else if (strcasecmp (cipher, "aes-192") == 0)
- {
- return GNUTLS_PKCS_USE_PBES2_AES_192;
- }
- else if (strcasecmp (cipher, "aes-256") == 0)
- {
- return GNUTLS_PKCS_USE_PBES2_AES_256;
- }
- else if (strcasecmp (cipher, "rc2-40") == 0)
- {
- return GNUTLS_PKCS_USE_PKCS12_RC2_40;
- }
-
- error (EXIT_FAILURE, 0, "Unknown cipher %s\n", cipher);
- return -1;
-}
-
-
static void
print_private_key (gnutls_x509_privkey_t key)
{
@@ -249,7 +220,7 @@ print_private_key (gnutls_x509_privkey_t key)
if (info.export)
flags = GNUTLS_PKCS_USE_PKCS12_RC2_40;
else
- flags = cipher_to_flags (info.pkcs_cipher);
+ flags = GNUTLS_PKCS_USE_PKCS12_3DES;
if ((pass = get_confirmed_pass (true)) == NULL || *pass == '\0')
flags = GNUTLS_PKCS_PLAIN;
hooks/post-receive
--
GNU gnutls
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, gnutls_2_8_x, updated. gnutls_2_8_6-6-g307f5c0,
Nikos Mavrogiannopoulos <=