diff options
| author | David Shaw <[email protected]> | 2003-11-21 00:55:41 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-11-21 00:55:41 +0000 |
| commit | f909811a7303758d250e01d396889613f87601d0 (patch) | |
| tree | f032b9f3f573c1321adaf641a7e4457976aec615 | |
| parent | * miscutil.c (match_multistr): New. Match against each segment in a (diff) | |
| download | gnupg-f909811a7303758d250e01d396889613f87601d0.tar.gz gnupg-f909811a7303758d250e01d396889613f87601d0.zip | |
* 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.
| -rw-r--r-- | g10/ChangeLog | 8 | ||||
| -rw-r--r-- | g10/misc.c | 2 | ||||
| -rw-r--r-- | g10/seskey.c | 10 |
3 files changed, 19 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 5022cd8e5..e856bff82 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,11 @@ +2003-11-20 David Shaw <[email protected]> + + * 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. + 2003-11-15 David Shaw <[email protected]> * compress-bz2.c (init_compress): Compression level 0 is not diff --git a/g10/misc.c b/g10/misc.c index eadfe7ef9..3d1c12e6a 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -547,7 +547,7 @@ compress_algo_to_string(int algo) switch(algo) { case COMPRESS_ALGO_NONE: - s="Uncompressed"; + s=_("Uncompressed"); break; case COMPRESS_ALGO_ZIP: diff --git a/g10/seskey.c b/g10/seskey.c index fc912eeb5..cd9939690 100644 --- a/g10/seskey.c +++ b/g10/seskey.c @@ -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_set_buffer( a, frame, nframe, 0 ); 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; } |