[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-133-gc0bd56a
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-133-gc0bd56a |
|
Date: |
Mon, 30 Jan 2012 22:29:41 +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=c0bd56a1d9bc395d91c407983448d444fc573aed
The branch, master has been updated
via c0bd56a1d9bc395d91c407983448d444fc573aed (commit)
via 29768dcbf7835fcfd29abbaae8236a0cb49aa50d (commit)
via 1da935f4f06f5427c67ab059f8e78dfc71b3eb5b (commit)
via 9fd1eec3dc03a7c8020508290d9de4a4c1cff280 (commit)
via 0ad90357f36d831cd2b18540d5a9743ce976b850 (commit)
via 398947c209f7d1440dc555543c79449552282181 (commit)
from 0c081da36e6bd14daf2e9471a330678e32cdf3ce (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 c0bd56a1d9bc395d91c407983448d444fc573aed
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Mon Jan 30 23:31:46 2012 +0100
use gnulib's base64 encoding/decoding code
commit 29768dcbf7835fcfd29abbaae8236a0cb49aa50d
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Mon Jan 30 23:31:13 2012 +0100
silence test
commit 1da935f4f06f5427c67ab059f8e78dfc71b3eb5b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Mon Jan 30 23:06:10 2012 +0100
align crc32 table
commit 9fd1eec3dc03a7c8020508290d9de4a4c1cff280
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Mon Jan 30 22:59:30 2012 +0100
__MINGW32__ -> _WIN32
commit 0ad90357f36d831cd2b18540d5a9743ce976b850
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Mon Jan 30 22:58:12 2012 +0100
removed dummy function
commit 398947c209f7d1440dc555543c79449552282181
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Mon Jan 30 22:06:22 2012 +0100
corrected spacing
-----------------------------------------------------------------------
Summary of changes:
lib/opencdk/armor.c | 269 ++++++++++-------------------------------
lib/opencdk/main.h | 3 -
lib/opencdk/write-packet.c | 6 +-
tests/openpgp-certs/testcerts | 5 +-
4 files changed, 71 insertions(+), 212 deletions(-)
diff --git a/lib/opencdk/armor.c b/lib/opencdk/armor.c
index 4476735..e007522 100644
--- a/lib/opencdk/armor.c
+++ b/lib/opencdk/armor.c
@@ -18,10 +18,6 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
- * ChangeLog for basic BASE64 code (base64_encode, base64_decode):
- * Original author: Eric S. Raymond (Fetchmail)
- * Heavily modified by Brendan Cully <address@hidden> (Mutt)
- * Modify the code for generic use by Timo Schulz <address@hidden>
*/
#ifdef HAVE_CONFIG_H
@@ -30,12 +26,13 @@
#include <stdio.h>
#include <string.h>
#include <sys/stat.h>
+#include <base64.h>
#include "opencdk.h"
#include "main.h"
#include "filters.h"
-#ifdef __MINGW32__
+#ifdef _WIN32
#define LF "\r\n"
#define ALTLF "\n"
#else
@@ -45,74 +42,44 @@
#define CRCINIT 0xB704CE
-#define BAD -1
-#define b64val(c) index64[(unsigned int)(c)]
-
static u32 crc_table[] = {
0x000000, 0x864CFB, 0x8AD50D, 0x0C99F6, 0x93E6E1, 0x15AA1A, 0x1933EC,
- 0x9F7F17,
- 0xA18139, 0x27CDC2, 0x2B5434, 0xAD18CF, 0x3267D8, 0xB42B23, 0xB8B2D5,
- 0x3EFE2E,
- 0xC54E89, 0x430272, 0x4F9B84, 0xC9D77F, 0x56A868, 0xD0E493, 0xDC7D65,
- 0x5A319E,
- 0x64CFB0, 0xE2834B, 0xEE1ABD, 0x685646, 0xF72951, 0x7165AA, 0x7DFC5C,
- 0xFBB0A7,
- 0x0CD1E9, 0x8A9D12, 0x8604E4, 0x00481F, 0x9F3708, 0x197BF3, 0x15E205,
- 0x93AEFE,
- 0xAD50D0, 0x2B1C2B, 0x2785DD, 0xA1C926, 0x3EB631, 0xB8FACA, 0xB4633C,
- 0x322FC7,
- 0xC99F60, 0x4FD39B, 0x434A6D, 0xC50696, 0x5A7981, 0xDC357A, 0xD0AC8C,
- 0x56E077,
+ 0x9F7F17, 0xA18139, 0x27CDC2, 0x2B5434, 0xAD18CF, 0x3267D8, 0xB42B23,
+ 0xB8B2D5, 0x3EFE2E, 0xC54E89, 0x430272, 0x4F9B84, 0xC9D77F, 0x56A868,
+ 0xD0E493, 0xDC7D65, 0x5A319E, 0x64CFB0, 0xE2834B, 0xEE1ABD, 0x685646,
+ 0xF72951, 0x7165AA, 0x7DFC5C, 0xFBB0A7, 0x0CD1E9, 0x8A9D12, 0x8604E4,
+ 0x00481F, 0x9F3708, 0x197BF3, 0x15E205, 0x93AEFE, 0xAD50D0, 0x2B1C2B,
+ 0x2785DD, 0xA1C926, 0x3EB631, 0xB8FACA, 0xB4633C, 0x322FC7, 0xC99F60,
+ 0x4FD39B, 0x434A6D, 0xC50696, 0x5A7981, 0xDC357A, 0xD0AC8C, 0x56E077,
0x681E59, 0xEE52A2, 0xE2CB54, 0x6487AF, 0xFBF8B8, 0x7DB443, 0x712DB5,
- 0xF7614E,
- 0x19A3D2, 0x9FEF29, 0x9376DF, 0x153A24, 0x8A4533, 0x0C09C8, 0x00903E,
- 0x86DCC5,
- 0xB822EB, 0x3E6E10, 0x32F7E6, 0xB4BB1D, 0x2BC40A, 0xAD88F1, 0xA11107,
- 0x275DFC,
- 0xDCED5B, 0x5AA1A0, 0x563856, 0xD074AD, 0x4F0BBA, 0xC94741, 0xC5DEB7,
- 0x43924C,
- 0x7D6C62, 0xFB2099, 0xF7B96F, 0x71F594, 0xEE8A83, 0x68C678, 0x645F8E,
- 0xE21375,
- 0x15723B, 0x933EC0, 0x9FA736, 0x19EBCD, 0x8694DA, 0x00D821, 0x0C41D7,
- 0x8A0D2C,
- 0xB4F302, 0x32BFF9, 0x3E260F, 0xB86AF4, 0x2715E3, 0xA15918, 0xADC0EE,
- 0x2B8C15,
+ 0xF7614E, 0x19A3D2, 0x9FEF29, 0x9376DF, 0x153A24, 0x8A4533, 0x0C09C8,
+ 0x00903E, 0x86DCC5, 0xB822EB, 0x3E6E10, 0x32F7E6, 0xB4BB1D, 0x2BC40A,
+ 0xAD88F1, 0xA11107, 0x275DFC, 0xDCED5B, 0x5AA1A0, 0x563856, 0xD074AD,
+ 0x4F0BBA, 0xC94741, 0xC5DEB7, 0x43924C, 0x7D6C62, 0xFB2099, 0xF7B96F,
+ 0x71F594, 0xEE8A83, 0x68C678, 0x645F8E, 0xE21375, 0x15723B, 0x933EC0,
+ 0x9FA736, 0x19EBCD, 0x8694DA, 0x00D821, 0x0C41D7, 0x8A0D2C, 0xB4F302,
+ 0x32BFF9, 0x3E260F, 0xB86AF4, 0x2715E3, 0xA15918, 0xADC0EE, 0x2B8C15,
0xD03CB2, 0x567049, 0x5AE9BF, 0xDCA544, 0x43DA53, 0xC596A8, 0xC90F5E,
- 0x4F43A5,
- 0x71BD8B, 0xF7F170, 0xFB6886, 0x7D247D, 0xE25B6A, 0x641791, 0x688E67,
- 0xEEC29C,
- 0x3347A4, 0xB50B5F, 0xB992A9, 0x3FDE52, 0xA0A145, 0x26EDBE, 0x2A7448,
- 0xAC38B3,
- 0x92C69D, 0x148A66, 0x181390, 0x9E5F6B, 0x01207C, 0x876C87, 0x8BF571,
- 0x0DB98A,
- 0xF6092D, 0x7045D6, 0x7CDC20, 0xFA90DB, 0x65EFCC, 0xE3A337, 0xEF3AC1,
- 0x69763A,
- 0x578814, 0xD1C4EF, 0xDD5D19, 0x5B11E2, 0xC46EF5, 0x42220E, 0x4EBBF8,
- 0xC8F703,
- 0x3F964D, 0xB9DAB6, 0xB54340, 0x330FBB, 0xAC70AC, 0x2A3C57, 0x26A5A1,
- 0xA0E95A,
+ 0x4F43A5, 0x71BD8B, 0xF7F170, 0xFB6886, 0x7D247D, 0xE25B6A, 0x641791,
+ 0x688E67, 0xEEC29C, 0x3347A4, 0xB50B5F, 0xB992A9, 0x3FDE52, 0xA0A145,
+ 0x26EDBE, 0x2A7448, 0xAC38B3, 0x92C69D, 0x148A66, 0x181390, 0x9E5F6B,
+ 0x01207C, 0x876C87, 0x8BF571, 0x0DB98A, 0xF6092D, 0x7045D6, 0x7CDC20,
+ 0xFA90DB, 0x65EFCC, 0xE3A337, 0xEF3AC1, 0x69763A, 0x578814, 0xD1C4EF,
+ 0xDD5D19, 0x5B11E2, 0xC46EF5, 0x42220E, 0x4EBBF8, 0xC8F703, 0x3F964D,
+ 0xB9DAB6, 0xB54340, 0x330FBB, 0xAC70AC, 0x2A3C57, 0x26A5A1, 0xA0E95A,
0x9E1774, 0x185B8F, 0x14C279, 0x928E82, 0x0DF195, 0x8BBD6E, 0x872498,
- 0x016863,
- 0xFAD8C4, 0x7C943F, 0x700DC9, 0xF64132, 0x693E25, 0xEF72DE, 0xE3EB28,
- 0x65A7D3,
- 0x5B59FD, 0xDD1506, 0xD18CF0, 0x57C00B, 0xC8BF1C, 0x4EF3E7, 0x426A11,
- 0xC426EA,
- 0x2AE476, 0xACA88D, 0xA0317B, 0x267D80, 0xB90297, 0x3F4E6C, 0x33D79A,
- 0xB59B61,
- 0x8B654F, 0x0D29B4, 0x01B042, 0x87FCB9, 0x1883AE, 0x9ECF55, 0x9256A3,
- 0x141A58,
- 0xEFAAFF, 0x69E604, 0x657FF2, 0xE33309, 0x7C4C1E, 0xFA00E5, 0xF69913,
- 0x70D5E8,
- 0x4E2BC6, 0xC8673D, 0xC4FECB, 0x42B230, 0xDDCD27, 0x5B81DC, 0x57182A,
- 0xD154D1,
+ 0x016863, 0xFAD8C4, 0x7C943F, 0x700DC9, 0xF64132, 0x693E25, 0xEF72DE,
+ 0xE3EB28, 0x65A7D3, 0x5B59FD, 0xDD1506, 0xD18CF0, 0x57C00B, 0xC8BF1C,
+ 0x4EF3E7, 0x426A11, 0xC426EA, 0x2AE476, 0xACA88D, 0xA0317B, 0x267D80,
+ 0xB90297, 0x3F4E6C, 0x33D79A, 0xB59B61, 0x8B654F, 0x0D29B4, 0x01B042,
+ 0x87FCB9, 0x1883AE, 0x9ECF55, 0x9256A3, 0x141A58, 0xEFAAFF, 0x69E604,
+ 0x657FF2, 0xE33309, 0x7C4C1E, 0xFA00E5, 0xF69913, 0x70D5E8, 0x4E2BC6,
+ 0xC8673D, 0xC4FECB, 0x42B230, 0xDDCD27, 0x5B81DC, 0x57182A, 0xD154D1,
0x26359F, 0xA07964, 0xACE092, 0x2AAC69, 0xB5D37E, 0x339F85, 0x3F0673,
- 0xB94A88,
- 0x87B4A6, 0x01F85D, 0x0D61AB, 0x8B2D50, 0x145247, 0x921EBC, 0x9E874A,
- 0x18CBB1,
- 0xE37B16, 0x6537ED, 0x69AE1B, 0xEFE2E0, 0x709DF7, 0xF6D10C, 0xFA48FA,
- 0x7C0401,
- 0x42FA2F, 0xC4B6D4, 0xC82F22, 0x4E63D9, 0xD11CCE, 0x575035, 0x5BC9C3,
- 0xDD8538
+ 0xB94A88, 0x87B4A6, 0x01F85D, 0x0D61AB, 0x8B2D50, 0x145247, 0x921EBC,
+ 0x9E874A, 0x18CBB1, 0xE37B16, 0x6537ED, 0x69AE1B, 0xEFE2E0, 0x709DF7,
+ 0xF6D10C, 0xFA48FA, 0x7C0401, 0x42FA2F, 0xC4B6D4, 0xC82F22, 0x4E63D9,
+ 0xD11CCE, 0x575035, 0x5BC9C3, 0xDD8538
};
static const char *armor_begin[] = {
@@ -143,119 +110,6 @@ static const char *valid_headers[] = {
static char b64chars[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-static int index64[128] = {
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
- -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
- -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1
-};
-
-
-/* encode a raw binary buffer to a null-terminated base64 strings */
-static int
-base64_encode (char *out, const byte * in, size_t len, size_t olen)
-{
- if (!out || !in)
- {
- gnutls_assert ();
- return CDK_Inv_Value;
- }
-
- while (len >= 3 && olen > 10)
- {
- *out++ = b64chars[in[0] >> 2];
- *out++ = b64chars[((in[0] << 4) & 0x30) | (in[1] >> 4)];
- *out++ = b64chars[((in[1] << 2) & 0x3c) | (in[2] >> 6)];
- *out++ = b64chars[in[2] & 0x3f];
- olen -= 4;
- len -= 3;
- in += 3;
- }
-
- /* clean up remainder */
- if (len > 0 && olen > 4)
- {
- byte fragment = 0;
- *out++ = b64chars[in[0] >> 2];
- fragment = (in[0] << 4) & 0x30;
- if (len > 1)
- fragment |= in[1] >> 4;
- *out++ = b64chars[fragment];
- *out++ = (len < 2) ? '=' : b64chars[(in[1] << 2) & 0x3c];
- *out++ = '=';
- }
- *out = '\0';
- return 0;
-}
-
-
-/* Convert '\0'-terminated base64 string to raw byte buffer.
- Returns length of returned buffer, or -1 on error. */
-static int
-base64_decode (byte * out, const char *in)
-{
- size_t len;
- byte digit1, digit2, digit3, digit4;
-
- if (!out || !in)
- {
- gnutls_assert ();
- return -1;
- }
-
- len = 0;
- do
- {
- digit1 = in[0];
- if (digit1 > 127 || b64val (digit1) == BAD)
- {
- gnutls_assert ();
- return -1;
- }
- digit2 = in[1];
- if (digit2 > 127 || b64val (digit2) == BAD)
- {
- gnutls_assert ();
- return -1;
- }
- digit3 = in[2];
- if (digit3 > 127 || ((digit3 != '=') && (b64val (digit3) == BAD)))
- {
- gnutls_assert ();
- return -1;
- }
- digit4 = in[3];
- if (digit4 > 127 || ((digit4 != '=') && (b64val (digit4) == BAD)))
- {
- gnutls_assert ();
- return -1;
- }
- in += 4;
-
- /* digits are already sanity-checked */
- *out++ = (b64val (digit1) << 2) | (b64val (digit2) >> 4);
- len++;
- if (digit3 != '=')
- {
- *out++ = ((b64val (digit2) << 4) & 0xf0) | (b64val (digit3) >> 2);
- len++;
- if (digit4 != '=')
- {
- *out++ = ((b64val (digit3) << 6) & 0xc0) | b64val (digit4);
- len++;
- }
- }
- }
- while (*in && digit4 != '=');
-
- return len;
-}
-
-
/* Return the compression algorithm in @r_zipalgo.
If the parameter is not set after execution,
the stream is not compressed. */
@@ -265,6 +119,7 @@ compress_get_algo (cdk_stream_t inp, int *r_zipalgo)
byte plain[512];
char buf[128];
int nread, pkttype;
+ size_t plain_size;
*r_zipalgo = 0;
cdk_stream_seek (inp, 0);
@@ -276,7 +131,8 @@ compress_get_algo (cdk_stream_t inp, int *r_zipalgo)
if (nread == 1 && !cdk_stream_eof (inp)
&& (nread = _cdk_stream_gets (inp, buf, DIM (buf) - 1)) > 0)
{
- base64_decode (plain, buf);
+ plain_size = sizeof(plain);
+ base64_decode (buf, nread, plain, &plain_size);
if (!(*plain & 0x80))
break;
pkttype = *plain & 0x40 ? (*plain & 0x3f) : ((*plain >> 2) & 0xf);
@@ -408,7 +264,7 @@ armor_encode (void *data, FILE * in, FILE * out)
return CDK_File_Error;
}
afx->crc = update_crc (afx->crc, (byte *) raw, nread);
- base64_encode (buf, (byte *) raw, nread, DIM (buf) - 1);
+ base64_encode ((byte *) raw, nread, buf, DIM (buf) - 1);
fprintf (out, "%s%s", buf, lf);
}
@@ -443,14 +299,6 @@ search_header (const char *buf, const char **array)
return -1;
}
-
-const char *
-_cdk_armor_get_lineend (void)
-{
- return LF;
-}
-
-
static cdk_error_t
armor_decode (void *data, FILE * in, FILE * out)
{
@@ -463,6 +311,7 @@ armor_decode (void *data, FILE * in, FILE * out)
int i, pgp_data = 0;
cdk_error_t rc = 0;
int len;
+ size_t raw_size, crcbuf_size;
if (!afx)
{
@@ -532,24 +381,32 @@ armor_decode (void *data, FILE * in, FILE * out)
len = strlen(buf);
- if (buf[len - 1] == '\n')
- buf[len - 1] = '\0';
- if (buf[len - 1] == '\r')
- buf[len - 1] = '\0';
+ if (len > 0 && buf[len - 1] == '\n')
+ {
+ len--;
+ buf[len] = '\0';
+ }
+ if (len > 0 && buf[len - 1] == '\r')
+ {
+ len--;
+ buf[len] = '\0';
+ }
if (buf[0] == '=' && strlen (s) == 5)
{ /* CRC */
memset (crcbuf, 0, sizeof (crcbuf));
- base64_decode (crcbuf, buf + 1);
+ crcbuf_size = sizeof(crcbuf);
+ base64_decode (buf + 1, len-1, crcbuf, &crcbuf_size);
crc2 = (crcbuf[0] << 16) | (crcbuf[1] << 8) | crcbuf[2];
break; /* stop here */
}
else
{
- nread = base64_decode (raw, buf);
- if (nread == -1 || nread == 0)
+ raw_size = sizeof(raw);
+ nread = base64_decode (buf, len, raw, &raw_size);
+ if (nread == 0)
break;
- afx->crc = update_crc (afx->crc, raw, nread);
- fwrite (raw, 1, nread, out);
+ afx->crc = update_crc (afx->crc, raw, raw_size);
+ fwrite (raw, 1, raw_size, out);
}
}
@@ -559,9 +416,15 @@ armor_decode (void *data, FILE * in, FILE * out)
{
int len = strlen(buf);
if (buf[len - 1] == '\n')
- buf[len - 1] = '\0';
+ {
+ len--;
+ buf[len] = '\0';
+ }
if (buf[len - 1] == '\r')
- buf[len - 1] = '\0';
+ {
+ len--;
+ buf[len] = '\0';
+ }
rc = CDK_General_Error;
afx->idx2 = search_header (buf, armor_end);
if (afx->idx2 >= 0)
@@ -644,7 +507,7 @@ cdk_armor_encode_buffer (const byte * inbuf, size_t inlen,
head = armor_begin[type];
tail = armor_end[type];
- le = _cdk_armor_get_lineend ();
+ le = LF;
pos = strlen (head) + 10 + 2 + 2 + strlen (tail) + 10 + 2 + 5 + 2 + 1;
/* The output data is 4/3 times larger, plus a line end for each line. */
pos += (4 * inlen / 3) + 2 * (4 * inlen / 3 / 64) + 1;
@@ -691,7 +554,7 @@ cdk_armor_encode_buffer (const byte * inbuf, size_t inlen,
len = rest;
}
rest -= len;
- base64_encode (tempout, tempbuf, len, DIM (tempout) - 1);
+ base64_encode (tempbuf, len, tempout, DIM (tempout) - 1);
memcpy (outbuf + pos, tempout, strlen (tempout));
pos += strlen (tempout);
memcpy (outbuf + pos, le, strlen (le));
diff --git a/lib/opencdk/main.h b/lib/opencdk/main.h
index b159875..e786fe6 100644
--- a/lib/opencdk/main.h
+++ b/lib/opencdk/main.h
@@ -75,9 +75,6 @@ cdk_error_t map_gnutls_error (int err);
#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)
-/*-- armor.c --*/
-const char *_cdk_armor_get_lineend (void);
-
/*-- main.c --*/
char *_cdk_passphrase_get (cdk_ctx_t hd, const char *prompt);
diff --git a/lib/opencdk/write-packet.c b/lib/opencdk/write-packet.c
index d698af4..0937c77 100644
--- a/lib/opencdk/write-packet.c
+++ b/lib/opencdk/write-packet.c
@@ -487,9 +487,9 @@ calc_s2ksize (cdk_pkt_seckey_t sk)
case CDK_S2K_ITERSALTED:
nbytes = 11;
break;
- case CDK_S2K_GNU_EXT:
- nbytes = 2;
- break;
+ case CDK_S2K_GNU_EXT:
+ nbytes = 2;
+ break;
}
nbytes += sk->protect.ivlen;
nbytes++; /* single cipher byte */
diff --git a/tests/openpgp-certs/testcerts b/tests/openpgp-certs/testcerts
index e5f96a2..6a90d14 100755
--- a/tests/openpgp-certs/testcerts
+++ b/tests/openpgp-certs/testcerts
@@ -25,7 +25,6 @@ SERV="${SERV:-../../src/gnutls-serv} -q"
CLI="${CLI:-../../src/gnutls-cli}"
PORT="${PORT:-5557}"
DEBUG=""
-unset RETCODE
if test "${WINDIR}" != "";then
exit 77
@@ -78,10 +77,10 @@ wait_server $PID
echo | $CLI $DEBUG --priority NORMAL:+CTYPE-OPENPGP -p $PORT 127.0.0.1
--pgpkeyring $srcdir/ca-public.gpg </dev/null >/dev/null || \
fail $PID "Connection to signed PGP certificate should have succeeded!
(error code $?)" $?
-$CLI $DEBUG --priority NORMAL:+CTYPE-OPENPGP -p $PORT 127.0.0.2 --pgpkeyring
$srcdir/ca-public.gpg </dev/null >/dev/null && \
+$CLI $DEBUG --priority NORMAL:+CTYPE-OPENPGP -p $PORT 127.0.0.2 --pgpkeyring
$srcdir/ca-public.gpg </dev/null >/dev/null 2>&1 && \
fail $PID "Connection to unrecognized IP address should have failed!"
kill $PID
wait
-exit ${RETCODE:-0}
+exit 0
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-133-gc0bd56a,
Nikos Mavrogiannopoulos <=