security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* import.c (gpgsm_import): Try to identify the type of input and

Browse source 
handle certs-only messages.

* maperror.c (map_gcry_err): Add libgcrypt's new S-expression errors.
(map_ksba_err): Add a few mappings.

* configure.ac: We now require libgcrypt 1.1.7 and libksba 0.4.2.
This commit is contained in:
Werner Koch 2002-05-21 08:29:17 +00:00
parent c7ceb874c2
commit 4f7330e0bb
4 changed files with 123 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

30
common/maperror.c
View file

@ -33,18 +33,28 @@
#include "../assuan/assuan.h"
/* Note: we might want to wrap this in a macro to get our hands on
the line and file where the error occired */
the line and file where the error occured */
int
map_ksba_err (int err)
{
switch (err)
{
case -1:
case 0:
case 0:
break;
case KSBA_Out_Of_Core: err = GNUPG_Out_Of_Core; break;
case KSBA_Invalid_Value: err = GNUPG_Invalid_Value; break;
case KSBA_Not_Implemented: err = GNUPG_Not_Implemented; break;
case KSBA_Conflict: err = GNUPG_Conflict; break;
case KSBA_Read_Error: err = GNUPG_Read_Error; break;
case KSBA_Write_Error: err = GNUPG_Write_Error; break;
case KSBA_No_Data: err = GNUPG_No_Data; break;
case KSBA_Bug: err = GNUPG_Bug; break;
case KSBA_Unsupported_Algorithm: err = GNUPG_Unsupported_Algorithm; break;
case KSBA_Invalid_Index: err = GNUPG_Invalid_Index; break;
case KSBA_Invalid_Sexp: err = GNUPG_Invalid_Sexp; break;
case KSBA_Unknown_Sexp: err = GNUPG_Unknown_Sexp; break;
default:
err = seterr (General_Error);
@ -94,6 +104,22 @@ map_gcry_err (int err)
err = GNUPG_Bug;
break;
case GCRYERR_SEXP_INV_LEN_SPEC :
case GCRYERR_SEXP_STRING_TOO_LONG :
case GCRYERR_SEXP_UNMATCHED_PAREN :
case GCRYERR_SEXP_NOT_CANONICAL :
case GCRYERR_SEXP_BAD_CHARACTER :
case GCRYERR_SEXP_BAD_QUOTATION :
case GCRYERR_SEXP_ZERO_PREFIX :
case GCRYERR_SEXP_NESTED_DH :
case GCRYERR_SEXP_UNMATCHED_DH :
case GCRYERR_SEXP_UNEXPECTED_PUNC :
case GCRYERR_SEXP_BAD_HEX_CHAR :
case GCRYERR_SEXP_ODD_HEX_NUMBERS :
case GCRYERR_SEXP_BAD_OCT_CHAR :
err = GNUPG_Invalid_Sexp;
break;
case GCRYERR_NO_MEM: err = GNUPG_Out_Of_Core; break;
case GCRYERR_NOT_IMPL: err = GNUPG_Not_Implemented; break;