[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_23-36-g8c7f
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_23-36-g8c7fcfd |
|
Date: |
Sun, 23 Sep 2012 17:07:39 +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=8c7fcfd346a0ba1aa31fa9d08bb4c9187557ab5f
The branch, gnutls_3_0_x-2 has been updated
via 8c7fcfd346a0ba1aa31fa9d08bb4c9187557ab5f (commit)
via fadef080864c1cfca040836aadb9eab247ecfca3 (commit)
via 1d8e1b9683b92f9d107593d8aa83fb3f1a185c41 (commit)
from efec91fb5a88680f6e21d06123c7ff6a25fa448c (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 8c7fcfd346a0ba1aa31fa9d08bb4c9187557ab5f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sun Sep 23 19:07:31 2012 +0200
updated
commit fadef080864c1cfca040836aadb9eab247ecfca3
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sun Sep 23 19:06:17 2012 +0200
reduced verbosity and better debugging.
commit 1d8e1b9683b92f9d107593d8aa83fb3f1a185c41
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Sun Sep 23 19:06:00 2012 +0200
Corrected bug in PGP subpacket encoding
-----------------------------------------------------------------------
Summary of changes:
NEWS | 2 +
lib/opencdk/kbnode.c | 4 +-
lib/opencdk/main.h | 4 +-
lib/opencdk/misc.c | 8 +++-
lib/opencdk/new-packet.c | 4 +-
lib/opencdk/read-packet.c | 104 ++++++++++++++++++++++++++++----------------
lib/opencdk/stream.c | 68 ++++++++++++++++++++++------
lib/opencdk/write-packet.c | 104 +++++++++++++++++++++++++++----------------
8 files changed, 200 insertions(+), 98 deletions(-)
diff --git a/NEWS b/NEWS
index cc02fd2..bab8395 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ See the end for copying conditions.
** libgnutls: The %COMPAT keyword, if specified, will tolerate
key usage violation errors (they are far too common to ignore).
+** libgnutls: Corrected bug in OpenPGP subpacket encoding.
+
** libgnutls: Added X.509 certificate verification flag
GNUTLS_VERIFY_ALLOW_UNSORTED_CHAIN. This flag allows the verification
of unsorted certificate chains and is enabled by default for
diff --git a/lib/opencdk/kbnode.c b/lib/opencdk/kbnode.c
index 8a93e9b..51c2748 100644
--- a/lib/opencdk/kbnode.c
+++ b/lib/opencdk/kbnode.c
@@ -415,11 +415,11 @@ cdk_kbnode_read_from_mem (cdk_kbnode_t * ret_node,
*ret_node = NULL;
if (!buflen)
- return CDK_Too_Short;
+ return gnutls_assert_val(CDK_Too_Short);
rc = cdk_stream_tmp_from_mem (buf, buflen, &inp);
if (rc)
- return rc;
+ return gnutls_assert_val(rc);
if (armor)
cdk_stream_set_armor_flag (inp, 0);
diff --git a/lib/opencdk/main.h b/lib/opencdk/main.h
index e786fe6..3d3472e 100644
--- a/lib/opencdk/main.h
+++ b/lib/opencdk/main.h
@@ -68,13 +68,13 @@ cdk_error_t map_gnutls_error (int err);
#define IS_UID_SIG(s) (((s)->sig_class & ~3) == 0x10)
#define IS_UID_REV(s) ((s)->sig_class == 0x30)
-#define DEBUG_PKT (_cdk_get_log_level () == (CDK_LOG_DEBUG+1))
-
/* Helper to find out if a key has the requested capability. */
#define KEY_CAN_ENCRYPT(a) ((_cdk_pk_algo_usage ((a))) & CDK_KEY_USG_ENCR)
#define KEY_CAN_SIGN(a) ((_cdk_pk_algo_usage ((a))) & CDK_KEY_USG_SIGN)
#define KEY_CAN_AUTH(a) ((_cdk_pk_algo_usage ((a))) & CDK_KEY_USG_AUTH)
+#define DEBUG_PKT 0
+
/*-- main.c --*/
char *_cdk_passphrase_get (cdk_ctx_t hd, const char *prompt);
diff --git a/lib/opencdk/misc.c b/lib/opencdk/misc.c
index ec6ad08..f270e6f 100644
--- a/lib/opencdk/misc.c
+++ b/lib/opencdk/misc.c
@@ -276,6 +276,8 @@ _pgp_cipher_to_gnutls (int cipher)
{
switch (cipher)
{
+ case 0:
+ return GNUTLS_CIPHER_NULL;
case 1:
return GNUTLS_CIPHER_IDEA_PGP_CFB;
case 2:
@@ -297,7 +299,8 @@ _pgp_cipher_to_gnutls (int cipher)
default:
gnutls_assert ();
- return GNUTLS_CIPHER_NULL;
+ _gnutls_debug_log("Unknown openpgp cipher %u\n", cipher);
+ return GNUTLS_CIPHER_UNKNOWN;
}
}
@@ -306,7 +309,8 @@ _gnutls_cipher_to_pgp (int cipher)
{
switch (cipher)
{
-
+ case GNUTLS_CIPHER_NULL:
+ return 0;
case GNUTLS_CIPHER_IDEA_PGP_CFB:
return 1;
case GNUTLS_CIPHER_3DES_PGP_CFB:
diff --git a/lib/opencdk/new-packet.c b/lib/opencdk/new-packet.c
index 9453476..7a7179a 100644
--- a/lib/opencdk/new-packet.c
+++ b/lib/opencdk/new-packet.c
@@ -711,8 +711,9 @@ _cdk_subpkt_get_array (cdk_subpkt_t s, int count, size_t *
r_nbytes)
buf[n++] = nbytes;
else if (nbytes < 8384)
{
+ nbytes -= 192;
buf[n++] = nbytes / 256 + 192;
- buf[n++] = nbytes % 256;
+ buf[n++] = nbytes & 0xff;
}
else
{
@@ -722,6 +723,7 @@ _cdk_subpkt_get_array (cdk_subpkt_t s, int count, size_t *
r_nbytes)
buf[n++] = nbytes >> 8;
buf[n++] = nbytes;
}
+
buf[n++] = list->type;
memcpy (buf + n, list->d, list->size);
n += list->size;
diff --git a/lib/opencdk/read-packet.c b/lib/opencdk/read-packet.c
index 3e92909..6abb088 100644
--- a/lib/opencdk/read-packet.c
+++ b/lib/opencdk/read-packet.c
@@ -130,7 +130,7 @@ read_mpi (cdk_stream_t inp, bigint_t * ret_m, int secure)
if (nbits > MAX_MPI_BITS || nbits == 0)
{
_gnutls_write_log ("read_mpi: too large %d bits\n", (int) nbits);
- return CDK_MPI_Error; /* Sanity check */
+ return gnutls_assert_val(CDK_MPI_Error); /* Sanity check */
}
rc = stream_read (inp, buf + 2, nread, &nread);
@@ -138,7 +138,7 @@ read_mpi (cdk_stream_t inp, bigint_t * ret_m, int secure)
{
_gnutls_write_log ("read_mpi: too short %d < %d\n", (int) nread,
(int) ((nbits + 7) / 8));
- return CDK_MPI_Error;
+ return gnutls_assert_val(CDK_MPI_Error);
}
buf[0] = nbits >> 8;
@@ -146,7 +146,7 @@ read_mpi (cdk_stream_t inp, bigint_t * ret_m, int secure)
nread += 2;
err = _gnutls_mpi_scan_pgp (&m, buf, nread);
if (err < 0)
- return map_gnutls_error (err);
+ return gnutls_assert_val(map_gnutls_error (err));
*ret_m = m;
return rc;
@@ -217,7 +217,7 @@ read_pubkey_enc (cdk_stream_t inp, size_t pktlen,
cdk_pkt_pubkey_enc_t pke)
{
cdk_error_t rc = read_mpi (inp, &pke->mpi[i], 0);
if (rc)
- return rc;
+ return gnutls_assert_val(rc);
}
return 0;
@@ -309,7 +309,7 @@ read_public_key (cdk_stream_t inp, size_t pktlen,
cdk_pkt_pubkey_t pk)
{
cdk_error_t rc = read_mpi (inp, &pk->mpi[i], 0);
if (rc)
- return rc;
+ return gnutls_assert_val(rc);
}
/* This value is just for the first run and will be
@@ -351,6 +351,9 @@ read_secret_key (cdk_stream_t inp, size_t pktlen,
cdk_pkt_seckey_t sk)
{
sk->protect.sha1chk = (sk->s2k_usage == 254);
sk->protect.algo = _pgp_cipher_to_gnutls (cdk_stream_getc (inp));
+ if (sk->protect.algo == GNUTLS_CIPHER_UNKNOWN)
+ return gnutls_assert_val(CDK_Inv_Algo);
+
sk->protect.s2k = cdk_calloc (1, sizeof *sk->protect.s2k);
if (!sk->protect.s2k)
return CDK_Out_Of_Core;
@@ -374,7 +377,9 @@ read_secret_key (cdk_stream_t inp, size_t pktlen,
cdk_pkt_seckey_t sk)
}
else
sk->protect.algo = _pgp_cipher_to_gnutls (sk->s2k_usage);
- if (sk->protect.algo == GNUTLS_CIPHER_NULL)
+ if (sk->protect.algo == GNUTLS_CIPHER_UNKNOWN)
+ return gnutls_assert_val(CDK_Inv_Algo);
+ else if (sk->protect.algo == GNUTLS_CIPHER_NULL)
{
sk->csum = 0;
nskey = cdk_pk_get_nskey (sk->pk->pubkey_algo);
@@ -387,7 +392,7 @@ read_secret_key (cdk_stream_t inp, size_t pktlen,
cdk_pkt_seckey_t sk)
{
rc = read_mpi (inp, &sk->mpi[i], 1);
if (rc)
- return rc;
+ return gnutls_assert_val(rc);
}
sk->csum = read_16 (inp);
sk->is_protected = 0;
@@ -405,7 +410,7 @@ read_secret_key (cdk_stream_t inp, size_t pktlen,
cdk_pkt_seckey_t sk)
{
rc = read_mpi (inp, &sk->mpi[i], 1);
if (rc)
- return rc;
+ return gnutls_assert_val(rc);
}
sk->csum = read_16 (inp);
sk->is_protected = 1;
@@ -726,20 +731,21 @@ static cdk_error_t
read_signature (cdk_stream_t inp, size_t pktlen, cdk_pkt_signature_t sig)
{
size_t nbytes;
- size_t i, size, nsig;
+ size_t i, nsig;
+ ssize_t size;
cdk_error_t rc;
if (!inp || !sig)
- return CDK_Inv_Value;
+ return gnutls_assert_val(CDK_Inv_Value);
if (DEBUG_PKT)
_gnutls_write_log ("read_signature: %d octets\n", (int) pktlen);
if (pktlen < 16)
- return CDK_Inv_Packet;
+ return gnutls_assert_val(CDK_Inv_Packet);
sig->version = cdk_stream_getc (inp);
if (sig->version < 2 || sig->version > 4)
- return CDK_Inv_Packet_Ver;
+ return gnutls_assert_val(CDK_Inv_Packet_Ver);
sig->flags.exportable = 1;
sig->flags.revocable = 1;
@@ -747,7 +753,7 @@ read_signature (cdk_stream_t inp, size_t pktlen,
cdk_pkt_signature_t sig)
if (sig->version < 4)
{
if (cdk_stream_getc (inp) != 5)
- return CDK_Inv_Packet;
+ return gnutls_assert_val(CDK_Inv_Packet);
sig->sig_class = cdk_stream_getc (inp);
sig->timestamp = read_32 (inp);
sig->keyid[0] = read_32 (inp);
@@ -758,12 +764,12 @@ read_signature (cdk_stream_t inp, size_t pktlen,
cdk_pkt_signature_t sig)
sig->digest_start[1] = cdk_stream_getc (inp);
nsig = cdk_pk_get_nsig (sig->pubkey_algo);
if (!nsig)
- return CDK_Inv_Algo;
+ return gnutls_assert_val(CDK_Inv_Algo);
for (i = 0; i < nsig; i++)
{
rc = read_mpi (inp, &sig->mpi[i], 0);
if (rc)
- return rc;
+ return gnutls_assert_val(rc);
}
}
else
@@ -778,7 +784,7 @@ read_signature (cdk_stream_t inp, size_t pktlen,
cdk_pkt_signature_t sig)
{
rc = read_subpkt (inp, &sig->hashed, &nbytes);
if (rc)
- return rc;
+ return gnutls_assert_val(rc);
size -= nbytes;
}
sig->unhashed_size = read_16 (inp);
@@ -788,24 +794,24 @@ read_signature (cdk_stream_t inp, size_t pktlen,
cdk_pkt_signature_t sig)
{
rc = read_subpkt (inp, &sig->unhashed, &nbytes);
if (rc)
- return rc;
+ return gnutls_assert_val(rc);
size -= nbytes;
}
rc = parse_sig_subpackets (sig);
if (rc)
- return rc;
+ return gnutls_assert_val(rc);
sig->digest_start[0] = cdk_stream_getc (inp);
sig->digest_start[1] = cdk_stream_getc (inp);
nsig = cdk_pk_get_nsig (sig->pubkey_algo);
if (!nsig)
- return CDK_Inv_Algo;
+ return gnutls_assert_val(CDK_Inv_Algo);
for (i = 0; i < nsig; i++)
{
rc = read_mpi (inp, &sig->mpi[i], 0);
if (rc)
- return rc;
+ return gnutls_assert_val(rc);
}
}
@@ -955,7 +961,7 @@ cdk_pkt_read (cdk_stream_t inp, cdk_packet_t pkt)
if (cdk_stream_eof (inp) || ctb == EOF)
return CDK_EOF;
else if (!ctb)
- return CDK_Inv_Packet;
+ return gnutls_assert_val(CDK_Inv_Packet);
pktsize++;
if (!(ctb & 0x80))
@@ -963,7 +969,7 @@ cdk_pkt_read (cdk_stream_t inp, cdk_packet_t pkt)
_cdk_log_info ("cdk_pkt_read: no openpgp data found. "
"(ctb=%02X; fpos=%02X)\n", (int) ctb,
(int) cdk_stream_tell (inp));
- return CDK_Inv_Packet;
+ return gnutls_assert_val(CDK_Inv_Packet);
}
if (ctb & 0x40) /* RFC2440 packet format. */
@@ -981,7 +987,7 @@ cdk_pkt_read (cdk_stream_t inp, cdk_packet_t pkt)
if (pkttype > 63)
{
_cdk_log_info ("cdk_pkt_read: unknown type %d\n", pkttype);
- return CDK_Inv_Packet;
+ return gnutls_assert_val(CDK_Inv_Packet);
}
if (is_newctb)
@@ -1002,100 +1008,124 @@ cdk_pkt_read (cdk_stream_t inp, cdk_packet_t pkt)
pkt->pkt.user_id = cdk_calloc (1, sizeof *pkt->pkt.user_id
+ NAME_SIZE);
if (!pkt->pkt.user_id)
- return CDK_Out_Of_Core;
+ return gnutls_assert_val(CDK_Out_Of_Core);
pkt->pkt.user_id->name =
(char *) pkt->pkt.user_id + sizeof (*pkt->pkt.user_id);
rc = read_attribute (inp, pktlen, pkt->pkt.user_id, NAME_SIZE);
pkt->pkttype = CDK_PKT_ATTRIBUTE;
+ if (rc)
+ return gnutls_assert_val(rc);
break;
case CDK_PKT_USER_ID:
pkt->pkt.user_id = cdk_calloc (1, sizeof *pkt->pkt.user_id
+ pkt->pktlen + 1);
if (!pkt->pkt.user_id)
- return CDK_Out_Of_Core;
+ return gnutls_assert_val(CDK_Out_Of_Core);
pkt->pkt.user_id->name =
(char *) pkt->pkt.user_id + sizeof (*pkt->pkt.user_id);
rc = read_user_id (inp, pktlen, pkt->pkt.user_id);
+ if (rc)
+ return gnutls_assert_val(rc);
break;
case CDK_PKT_PUBLIC_KEY:
pkt->pkt.public_key = cdk_calloc (1, sizeof *pkt->pkt.public_key);
if (!pkt->pkt.public_key)
- return CDK_Out_Of_Core;
+ return gnutls_assert_val(CDK_Out_Of_Core);
rc = read_public_key (inp, pktlen, pkt->pkt.public_key);
+ if (rc)
+ return gnutls_assert_val(rc);
break;
case CDK_PKT_PUBLIC_SUBKEY:
pkt->pkt.public_key = cdk_calloc (1, sizeof *pkt->pkt.public_key);
if (!pkt->pkt.public_key)
- return CDK_Out_Of_Core;
+ return gnutls_assert_val(CDK_Out_Of_Core);
rc = read_public_subkey (inp, pktlen, pkt->pkt.public_key);
+ if (rc)
+ return gnutls_assert_val(rc);
break;
case CDK_PKT_SECRET_KEY:
pkt->pkt.secret_key = cdk_calloc (1, sizeof *pkt->pkt.secret_key);
if (!pkt->pkt.secret_key)
- return CDK_Out_Of_Core;
+ return gnutls_assert_val(CDK_Out_Of_Core);
pkt->pkt.secret_key->pk = cdk_calloc (1,
sizeof *pkt->pkt.secret_key->pk);
if (!pkt->pkt.secret_key->pk)
- return CDK_Out_Of_Core;
+ return gnutls_assert_val(CDK_Out_Of_Core);
rc = read_secret_key (inp, pktlen, pkt->pkt.secret_key);
+ if (rc)
+ return gnutls_assert_val(rc);
break;
case CDK_PKT_SECRET_SUBKEY:
pkt->pkt.secret_key = cdk_calloc (1, sizeof *pkt->pkt.secret_key);
if (!pkt->pkt.secret_key)
- return CDK_Out_Of_Core;
+ return gnutls_assert_val(CDK_Out_Of_Core);
pkt->pkt.secret_key->pk = cdk_calloc (1,
sizeof *pkt->pkt.secret_key->pk);
if (!pkt->pkt.secret_key->pk)
- return CDK_Out_Of_Core;
+ return gnutls_assert_val(CDK_Out_Of_Core);
rc = read_secret_subkey (inp, pktlen, pkt->pkt.secret_key);
+ if (rc)
+ return gnutls_assert_val(rc);
break;
case CDK_PKT_LITERAL:
pkt->pkt.literal = cdk_calloc (1, sizeof *pkt->pkt.literal);
if (!pkt->pkt.literal)
- return CDK_Out_Of_Core;
+ return gnutls_assert_val(CDK_Out_Of_Core);
rc = read_literal (inp, pktlen, &pkt->pkt.literal, is_partial);
+ if (rc)
+ return gnutls_assert_val(rc);
break;
case CDK_PKT_ONEPASS_SIG:
pkt->pkt.onepass_sig = cdk_calloc (1, sizeof *pkt->pkt.onepass_sig);
if (!pkt->pkt.onepass_sig)
- return CDK_Out_Of_Core;
+ return gnutls_assert_val(CDK_Out_Of_Core);
rc = read_onepass_sig (inp, pktlen, pkt->pkt.onepass_sig);
+ if (rc)
+ return gnutls_assert_val(rc);
break;
case CDK_PKT_SIGNATURE:
pkt->pkt.signature = cdk_calloc (1, sizeof *pkt->pkt.signature);
if (!pkt->pkt.signature)
- return CDK_Out_Of_Core;
+ return gnutls_assert_val(CDK_Out_Of_Core);
rc = read_signature (inp, pktlen, pkt->pkt.signature);
+ if (rc)
+ return gnutls_assert_val(rc);
break;
case CDK_PKT_PUBKEY_ENC:
pkt->pkt.pubkey_enc = cdk_calloc (1, sizeof *pkt->pkt.pubkey_enc);
if (!pkt->pkt.pubkey_enc)
- return CDK_Out_Of_Core;
+ return gnutls_assert_val(CDK_Out_Of_Core);
rc = read_pubkey_enc (inp, pktlen, pkt->pkt.pubkey_enc);
+ if (rc)
+ return gnutls_assert_val(rc);
break;
case CDK_PKT_COMPRESSED:
pkt->pkt.compressed = cdk_calloc (1, sizeof *pkt->pkt.compressed);
if (!pkt->pkt.compressed)
- return CDK_Out_Of_Core;
+ return gnutls_assert_val(CDK_Out_Of_Core);
rc = read_compressed (inp, pktlen, pkt->pkt.compressed);
+ if (rc)
+ return gnutls_assert_val(rc);
break;
case CDK_PKT_MDC:
pkt->pkt.mdc = cdk_calloc (1, sizeof *pkt->pkt.mdc);
if (!pkt->pkt.mdc)
- return CDK_Out_Of_Core;
+ return gnutls_assert_val(CDK_Out_Of_Core);
rc = read_mdc (inp, pkt->pkt.mdc);
+ if (rc)
+ return gnutls_assert_val(rc);
break;
default:
diff --git a/lib/opencdk/stream.c b/lib/opencdk/stream.c
index bfc96ab..aff1109 100644
--- a/lib/opencdk/stream.c
+++ b/lib/opencdk/stream.c
@@ -82,7 +82,9 @@ _cdk_stream_open_mode (const char *file, const char *mode,
return CDK_Inv_Value;
}
+#ifdef DEBUG_STREAM
_gnutls_read_log ("open stream `%s'\n", file);
+#endif
*ret_s = NULL;
s = cdk_calloc (1, sizeof *s);
if (!s)
@@ -105,7 +107,9 @@ _cdk_stream_open_mode (const char *file, const char *mode,
gnutls_assert ();
return CDK_File_Error;
}
+#ifdef DEBUG_STREAM
_gnutls_read_log ("open stream fd=%d\n", fileno (s->fp));
+#endif
s->flags.write = 0;
*ret_s = s;
return 0;
@@ -175,7 +179,9 @@ cdk_stream_new (const char *file, cdk_stream_t * ret_s)
return CDK_Inv_Value;
}
+#ifdef DEBUG_STREAM
_gnutls_read_log ("new stream `%s'\n", file ? file : "[temp]");
+#endif
*ret_s = NULL;
s = cdk_calloc (1, sizeof *s);
if (!s)
@@ -204,7 +210,9 @@ cdk_stream_new (const char *file, cdk_stream_t * ret_s)
gnutls_assert ();
return CDK_File_Error;
}
+#ifdef DEBUG_STREAM
_gnutls_read_log ("new stream fd=%d\n", fileno (s->fp));
+#endif
*ret_s = s;
return 0;
}
@@ -229,7 +237,9 @@ cdk_stream_create (const char *file, cdk_stream_t * ret_s)
return CDK_Inv_Value;
}
+#ifdef DEBUG_STREAM
_gnutls_read_log ("create stream `%s'\n", file);
+#endif
*ret_s = NULL;
s = cdk_calloc (1, sizeof *s);
if (!s)
@@ -254,7 +264,9 @@ cdk_stream_create (const char *file, cdk_stream_t * ret_s)
gnutls_assert ();
return CDK_File_Error;
}
+#ifdef DEBUG_STREAM
_gnutls_read_log ("stream create fd=%d\n", fileno (s->fp));
+#endif
*ret_s = s;
return 0;
}
@@ -323,7 +335,9 @@ _cdk_stream_fpopen (FILE * fp, unsigned write_mode,
cdk_stream_t * ret_out)
return CDK_Out_Of_Core;
}
+#ifdef DEBUG_STREAM
_gnutls_read_log ("stream ref fd=%d\n", fileno (fp));
+#endif
s->fp = fp;
s->fp_ref = 1;
s->flags.filtrated = 1;
@@ -457,8 +471,10 @@ cdk_stream_close (cdk_stream_t s)
return CDK_Inv_Value;
}
+#ifdef DEBUG_STREAM
_gnutls_read_log ("close stream ref=%d `%s'\n",
s->fp_ref, s->fname ? s->fname : "[temp]");
+#endif
/* In the user callback mode, we call the release cb if possible
and just free the stream. */
@@ -481,7 +497,9 @@ cdk_stream_close (cdk_stream_t s)
{
int err;
+#ifdef DEBUG_STREAM
_gnutls_read_log ("close stream fd=%d\n", fileno (s->fp));
+#endif
err = fclose (s->fp);
s->fp = NULL;
if (err)
@@ -510,7 +528,10 @@ cdk_stream_close (cdk_stream_t s)
s->cache.alloced = 0;
cdk_free (s);
- gnutls_assert ();
+
+ if (rc)
+ gnutls_assert ();
+
return rc;
}
@@ -754,8 +775,10 @@ stream_fp_replace (cdk_stream_t s, FILE ** tmp)
assert (s);
+#ifdef DEBUG_STREAM
_gnutls_read_log ("replace stream fd=%d with fd=%d\n",
fileno (s->fp), fileno (*tmp));
+#endif
rc = fclose (s->fp);
if (rc)
{
@@ -791,8 +814,10 @@ stream_filter_write (cdk_stream_t s)
if (!f->flags.enabled)
continue;
/* if there is no next filter, create the final output file */
+#ifdef DEBUG_STREAM
_gnutls_read_log ("filter [write]: last filter=%d fname=%s\n",
f->next ? 1 : 0, s->fname);
+#endif
if (!f->next && s->fname)
f->tmp = fopen (s->fname, "w+b");
else
@@ -812,14 +837,18 @@ stream_filter_write (cdk_stream_t s)
break;
}
rc = f->fnct (f->uint8_t, f->ctl, s->fp, f->tmp);
+#ifdef DEBUG_STREAM
_gnutls_read_log ("filter [write]: type=%d rc=%d\n", f->type, rc);
+#endif
if (!rc)
rc = stream_fp_replace (s, &f->tmp);
if (!rc)
rc = cdk_stream_seek (s, 0);
if (rc)
{
+#ifdef DEBUG_STREAM
_gnutls_read_log ("filter [close]: fd=%d\n", fileno (f->tmp));
+#endif
fclose (f->tmp);
f->tmp = NULL;
break;
@@ -851,8 +880,10 @@ stream_filter_read (cdk_stream_t s)
continue;
if (f->flags.error)
{
+#ifdef DEBUG_STREAM
_gnutls_read_log ("filter %s [read]: has the error flag; skipped\n",
s->fname ? s->fname : "[temp]");
+#endif
continue;
}
@@ -863,8 +894,10 @@ stream_filter_read (cdk_stream_t s)
break;
}
rc = f->fnct (f->uint8_t, f->ctl, s->fp, f->tmp);
+#ifdef DEBUG_STREAM
_gnutls_read_log ("filter %s [read]: type=%d rc=%d\n",
s->fname ? s->fname : "[temp]", f->type, rc);
+#endif
if (rc)
{
f->flags.error = 1;
@@ -1047,6 +1080,10 @@ cdk_stream_write (cdk_stream_t s, const void *buf,
size_t count)
if (s->cache.on)
{
+#ifdef DEBUG_STREAM
+ _gnutls_read_log ("stream[ref=%u]: written %d bytes\n", s->fp_ref, (int)
count);
+#endif
+
/* We need to resize the buffer if the additional data wouldn't
fit into it. We allocate more memory to avoid to resize it the
next time the function is used. */
@@ -1059,14 +1096,21 @@ cdk_stream_write (cdk_stream_t s, const void *buf,
size_t count)
s->cache.alloced += (count + STREAM_BUFSIZE);
memcpy (s->cache.buf, old, s->cache.size);
cdk_free (old);
+#ifdef DEBUG_STREAM
_gnutls_read_log ("stream: enlarge cache to %d octets\n",
(int) s->cache.alloced);
+#endif
}
+
memcpy (s->cache.buf + s->cache.size, buf, count);
s->cache.size += count;
return count;
}
+#ifdef DEBUG_STREAM
+ _gnutls_read_log ("stream[fd=%u]: written %d bytes\n", fileno (s->fp), (int)
count);
+#endif
+
nwritten = fwrite (buf, 1, count, s->fp);
if (!nwritten)
nwritten = EOF;
@@ -1197,7 +1241,9 @@ cdk_stream_set_literal_flag (cdk_stream_t s,
cdk_lit_format_t mode,
struct stream_filter_s *f;
const char *orig_fname;
+#ifdef DEBUG_STREAM
_gnutls_read_log ("stream: enable literal mode.\n");
+#endif
if (!s)
{
@@ -1242,20 +1288,6 @@ cdk_stream_set_compress_flag (cdk_stream_t s, int algo,
int level)
gnutls_assert ();
return CDK_Not_Implemented;
-
-#if 0
- struct stream_filter_s *f;
-
- if (!s)
- return CDK_Inv_Value;
- f = filter_add (s, _cdk_filter_compress, fCOMPRESS);
- if (!f)
- return CDK_Out_Of_Core;
- f->ctl = stream_get_mode (s);
- f->u.zfx.algo = algo;
- f->u.zfx.level = level;
- return 0;
-#endif
}
@@ -1349,8 +1381,10 @@ cdk_stream_enable_cache (cdk_stream_t s, int val)
{
s->cache.buf = cdk_calloc (1, STREAM_BUFSIZE);
s->cache.alloced = STREAM_BUFSIZE;
+#ifdef DEBUG_STREAM
_gnutls_read_log ("stream: allocate cache of %d octets\n",
STREAM_BUFSIZE);
+#endif
}
return 0;
}
@@ -1455,7 +1489,9 @@ cdk_stream_mmap_part (cdk_stream_t s, off_t off, size_t
len,
/* Memory mapping is not supported on custom I/O objects. */
if (s->cbs_hd)
{
+#ifdef DEBUG_STREAM
_gnutls_read_log ("cdk_stream_mmap_part: not supported on callbacks\n");
+#endif
gnutls_assert ();
return CDK_Inv_Mode;
}
@@ -1579,8 +1615,10 @@ _cdk_stream_set_blockmode (cdk_stream_t s, size_t nbytes)
{
assert (s);
+#ifdef DEBUG_STREAM
_gnutls_read_log ("stream: activate block mode with blocksize %d\n",
(int) nbytes);
+#endif
s->blkmode = nbytes;
return 0;
}
diff --git a/lib/opencdk/write-packet.c b/lib/opencdk/write-packet.c
index 77b9db1..7a53e84 100644
--- a/lib/opencdk/write-packet.c
+++ b/lib/opencdk/write-packet.c
@@ -369,57 +369,81 @@ write_signature (cdk_stream_t out, cdk_pkt_signature_t
sig, int old_ctb)
return CDK_Inv_Value;
if (!KEY_CAN_SIGN (sig->pubkey_algo))
- return CDK_Inv_Algo;
+ return gnutls_assert_val(CDK_Inv_Algo);
if (sig->version < 2 || sig->version > 4)
- return CDK_Inv_Packet;
+ return gnutls_assert_val(CDK_Inv_Packet);
if (DEBUG_PKT)
_gnutls_write_log ("write_signature:\n");
nsig = cdk_pk_get_nsig (sig->pubkey_algo);
if (!nsig)
- return CDK_Inv_Algo;
+ return gnutls_assert_val(CDK_Inv_Algo);
if (sig->version < 4)
return write_v3_sig (out, sig, nsig);
size = 10 + calc_subpktsize (sig->hashed)
+ calc_subpktsize (sig->unhashed) + calc_mpisize (sig->mpi, nsig);
+
rc = pkt_write_head (out, 0, size, CDK_PKT_SIGNATURE);
- if (!rc)
- rc = stream_putc (out, 4);
- if (!rc)
- rc = stream_putc (out, sig->sig_class);
- if (!rc)
- rc = stream_putc (out, _cdk_pub_algo_to_pgp (sig->pubkey_algo));
- if (!rc)
- rc = stream_putc (out, _gnutls_hash_algo_to_pgp (sig->digest_algo));
- if (!rc)
- rc = write_16 (out, sig->hashed_size);
- if (!rc)
- {
- buf = _cdk_subpkt_get_array (sig->hashed, 0, &nbytes);
- if (!buf)
- return CDK_Out_Of_Core;
- rc = stream_write (out, buf, nbytes);
- cdk_free (buf);
- }
- if (!rc)
- rc = write_16 (out, sig->unhashed_size);
- if (!rc)
- {
- buf = _cdk_subpkt_get_array (sig->unhashed, 0, &nbytes);
- if (!buf)
- return CDK_Out_Of_Core;
- rc = stream_write (out, buf, nbytes);
- cdk_free (buf);
- }
- if (!rc)
- rc = stream_putc (out, sig->digest_start[0]);
- if (!rc)
- rc = stream_putc (out, sig->digest_start[1]);
- if (!rc)
- rc = write_mpibuf (out, sig->mpi, nsig);
- return rc;
+ if (rc)
+ return gnutls_assert_val(rc);
+
+ rc = stream_putc (out, 4);
+ if (rc)
+ return gnutls_assert_val(rc);
+
+ rc = stream_putc (out, sig->sig_class);
+ if (rc)
+ return gnutls_assert_val(rc);
+
+ rc = stream_putc (out, _cdk_pub_algo_to_pgp (sig->pubkey_algo));
+ if (rc)
+ return gnutls_assert_val(rc);
+
+ rc = stream_putc (out, _gnutls_hash_algo_to_pgp (sig->digest_algo));
+ if (rc)
+ return gnutls_assert_val(rc);
+
+ rc = write_16 (out, sig->hashed_size);
+ if (rc)
+ return gnutls_assert_val(rc);
+
+ buf = _cdk_subpkt_get_array (sig->hashed, 0, &nbytes);
+ if (!buf)
+ return gnutls_assert_val(CDK_Out_Of_Core);
+
+ rc = stream_write (out, buf, nbytes);
+ cdk_free (buf);
+ if (rc)
+ return gnutls_assert_val(rc);
+
+ rc = write_16 (out, sig->unhashed_size);
+ if (rc)
+ return gnutls_assert_val(rc);
+
+ buf = _cdk_subpkt_get_array (sig->unhashed, 0, &nbytes);
+ if (!buf)
+ return gnutls_assert_val(CDK_Out_Of_Core);
+
+ rc = stream_write (out, buf, nbytes);
+ cdk_free (buf);
+ if (rc)
+ return gnutls_assert_val(rc);
+
+ rc = stream_putc (out, sig->digest_start[0]);
+ if (rc)
+ return gnutls_assert_val(rc);
+
+ rc = stream_putc (out, sig->digest_start[1]);
+ if (rc)
+ return gnutls_assert_val(rc);
+
+ rc = write_mpibuf (out, sig->mpi, nsig);
+ if (rc)
+ return gnutls_assert_val(rc);
+
+ return 0;
}
@@ -776,7 +800,9 @@ cdk_pkt_write (cdk_stream_t out, cdk_packet_t pkt)
if (!out || !pkt)
return CDK_Inv_Value;
- _gnutls_write_log ("write packet pkttype=%d\n", pkt->pkttype);
+ if (DEBUG_PKT)
+ _gnutls_write_log ("write packet pkttype=%d\n", pkt->pkttype);
+
switch (pkt->pkttype)
{
case CDK_PKT_LITERAL:
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_23-36-g8c7fcfd,
Nikos Mavrogiannopoulos <=