diff options
Diffstat (limited to '')
| -rw-r--r-- | gpgme/ChangeLog | 2 | ||||
| -rw-r--r-- | gpgme/decrypt.c | 46 |
2 files changed, 26 insertions, 22 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index d3b6cd5b..216e8977 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,5 +1,7 @@ 2002-11-21 Marcus Brinkmann <[email protected]> + * decrypt.c: Some beautyfication. + * verify.c (_gpgme_verify_status_handler): Treat GPGME_STATUS_UNEXPECTED like GPGME_STATUS_NODATA. Reported by Miguel Coca <[email protected]>. diff --git a/gpgme/decrypt.c b/gpgme/decrypt.c index a5a2fa72..96fbc211 100644 --- a/gpgme/decrypt.c +++ b/gpgme/decrypt.c @@ -1,25 +1,26 @@ -/* decrypt.c - decrypt functions - * Copyright (C) 2000 Werner Koch (dd9jn) - * Copyright (C) 2001, 2002 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GPGME is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ - +/* decrypt.c - Decrypt function. + Copyright (C) 2000 Werner Koch (dd9jn) + Copyright (C) 2001, 2002 g10 Code GmbH + + This file is part of GPGME. + + GPGME is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + GPGME is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GPGME; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#if HAVE_CONFIG_H #include <config.h> +#endif #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -49,7 +50,7 @@ _gpgme_release_decrypt_result (DecryptResult result) case. This is case insensitive. If NEXT is not NULL return the number of bytes to be added to STRING to get to the next token; a returned value of 0 indicates end of line. - Fixme: Duplicated from verify.c. */ + Fixme: Duplicated from verify.c. */ static int is_token (const char *string, const char *token, size_t *next) { @@ -68,6 +69,7 @@ is_token (const char *string, const char *token, size_t *next) return 1; } + static int skip_token (const char *string, size_t *next) { |