security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

* seskey.c (do_encode_md): Comment about earlier (pre-PGP 2.3) encodings.

Browse Source 
* misc.c (compress_algo_to_string): Translate "Uncompressed". Requested by
Tommi Vainikainen. (string_to_compress_algo): Include multi-string for
"uncompressed|none".
This commit is contained in:
David Shaw 2003-11-21 01:11:25 +00:00
parent e81943f748
commit 85a80265c7
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
g10/ChangeLog
View File

@ -1,3 +1,13 @@
2003-11-20 David Shaw <dshaw@jabberwocky.com>
* seskey.c (do_encode_md): Comment about earlier (pre-PGP 2.3)
encodings.
* misc.c (compress_algo_to_string): Translate "Uncompressed".
Requested by Tommi Vainikainen.
(string_to_compress_algo): Include multi-string for
"uncompressed|none".
2003-11-17 David Shaw <dshaw@jabberwocky.com> 2003-11-17 David Shaw <dshaw@jabberwocky.com>
* options.h, g10.c (main), compress-bz2.c (init_uncompress): Add * options.h, g10.c (main), compress-bz2.c (init_uncompress): Add

7
g10/misc.c
View File

@ -549,7 +549,7 @@ compress_algo_to_string(int algo)
switch(algo) switch(algo)
{ {
case COMPRESS_ALGO_NONE: case COMPRESS_ALGO_NONE:
s="Uncompressed"; s=_("Uncompressed");
break; break;
case COMPRESS_ALGO_ZIP: case COMPRESS_ALGO_ZIP:
@ -573,7 +573,10 @@ compress_algo_to_string(int algo)
int int
string_to_compress_algo(const char *string) string_to_compress_algo(const char *string)
{ {
if(ascii_strcasecmp(string,"uncompressed")==0) /* NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. */
if(match_multistr(_("uncompressed|none"),string))
return 0;
else if(ascii_strcasecmp(string,"uncompressed")==0)
return 0; return 0;
else if(ascii_strcasecmp(string,"none")==0) else if(ascii_strcasecmp(string,"none")==0)
return 0; return 0;

11
g10/seskey.c
View File

@ -175,6 +175,16 @@ do_encode_md( MD_HANDLE md, int algo, size_t len, unsigned nbits,
: mpi_alloc( (nframe+BYTES_PER_MPI_LIMB-1) / BYTES_PER_MPI_LIMB ); : mpi_alloc( (nframe+BYTES_PER_MPI_LIMB-1) / BYTES_PER_MPI_LIMB );
mpi_set_buffer( a, frame, nframe, 0 ); mpi_set_buffer( a, frame, nframe, 0 );
m_free(frame); m_free(frame);
/* Note that PGP before version 2.3 encoded the MD as:
*
* 0 1 MD(16 bytes) 0 PAD(n bytes) 1
*
* The MD is always 16 bytes here because it's always MD5. We do
* not support pre-v2.3 signatures, but I'm including this comment
* so the information is easily found in the future.
*/
return a; return a;
} }
@ -214,4 +224,3 @@ encode_md_value( int pubkey_algo, MD_HANDLE md, int hash_algo,
} }
return frame; return frame;
} }