diff options
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | g10/ChangeLog | 10 | ||||
| -rw-r--r-- | g10/passphrase.c | 8 | ||||
| -rwxr-xr-x | scripts/mk-w32-dist | 6 | ||||
| -rw-r--r-- | util/ChangeLog | 5 | ||||
| -rw-r--r-- | util/http.c | 2 |
7 files changed, 31 insertions, 3 deletions
@@ -137,6 +137,7 @@ Reinhard Wobst [email protected] R�mi Guyomarch [email protected] Reuben Sumner [email protected] Richard Outerbridge [email protected] +Robert Joop [email protected] Roddy Strachan [email protected] Roger Sondermann [email protected] Roland Rosenfeld [email protected] @@ -1,4 +1,6 @@ + * check all mpi_read() for error returns. + * --preserve-perms so that permissions set on a secring don't get changed. * Check that no secret temporary results are stored in the result parameter diff --git a/g10/ChangeLog b/g10/ChangeLog index 0be49aec0..eaf5ec360 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,13 @@ +2001-05-04 Werner Koch <[email protected]> + + * passphrase.c (passphrase_clear_cache): Shortcut if agent usage + is not enabled. + +2001-05-01 Werner Koch <[email protected]> + + * passphrase.c (writen): Replaced ssize_t by int. Thanks to + to Robert Joop for reporting that SunOS 4.1.4 does not have it. + 2001-04-28 Werner Koch <[email protected]> * getkey.c (merge_public_with_secret): pkttype was not set to subkey. diff --git a/g10/passphrase.c b/g10/passphrase.c index b85943264..a34ebbd61 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -158,7 +158,7 @@ static int writen ( int fd, const void *buf, size_t nbytes ) { size_t nleft = nbytes; - ssize_t nwritten; + int nwritten; while( nleft > 0 ) { nwritten = write( fd, buf, nleft ); @@ -435,13 +435,17 @@ passphrase_clear_cache ( u32 *keyid, int algo ) int fd = -1; int nread; u32 reply; - PKT_public_key *pk = m_alloc_clear ( sizeof *pk ); + PKT_public_key *pk; byte fpr[MAX_FINGERPRINT_LEN]; #if MAX_FINGERPRINT_LEN < 20 #error agent needs a 20 byte fingerprint #endif + if (!opt.use_agent) + return; + + pk = m_alloc_clear ( sizeof *pk ); memset (fpr, 0, MAX_FINGERPRINT_LEN ); if( !keyid || get_pubkey( pk, keyid ) ) { log_debug ("oops, no key in passphrase_clear_cache\n"); diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist index 4fd36a5ef..56e724dc8 100755 --- a/scripts/mk-w32-dist +++ b/scripts/mk-w32-dist @@ -37,9 +37,15 @@ fi todos gpg.man cp ${srcdir}/README . todos README +cp ${srcdir}/COPYING . +todos COPYING ln ${srcdir}/doc/README.W32 . todos README.W32 for i in ${srcdir}/po/*.gmo; do ln $i "$(basename $i .gmo).mo" ; done zip "gnupg-w32-$(cat ${srcdir}/VERSION).zip" * + + + + diff --git a/util/ChangeLog b/util/ChangeLog index c91c3d9d0..6d34f4c4a 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,8 @@ +2001-05-05 Werner Koch <[email protected]> + + * http.c (http_start_data): Flush before writing. + (http_wait_response): No need to flush here. + 2001-04-27 Werner Koch <[email protected]> * memory.c (out_of_core): Print an explanation on reasons why diff --git a/util/http.c b/util/http.c index f3429c5db..c1ab6371c 100644 --- a/util/http.c +++ b/util/http.c @@ -149,6 +149,7 @@ http_open( HTTP_HD hd, HTTP_REQ_TYPE reqtype, const char *url, void http_start_data( HTTP_HD hd ) { + iobuf_flush ( hd->fp_write ); if( !hd->in_data ) { write_server (hd->sock, "\r\n", 2); hd->in_data = 1; @@ -162,7 +163,6 @@ http_wait_response( HTTP_HD hd, unsigned int *ret_status ) int rc; http_start_data( hd ); /* make sure that we are in the data */ - iobuf_flush( hd->fp_write ); #if 0 hd->sock = dup( hd->sock ); |