mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Mainly changes to adjust for the changed KSBA API.
This commit is contained in:
parent
f794da4ad4
commit
dba40e5e45
36 changed files with 217 additions and 246 deletions
|
@ -1,3 +1,7 @@
|
|||
2003-11-12 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* maperror.c (map_ksba_err, map_gcry_err, map_kbx_err): Removed.
|
||||
|
||||
2003-10-31 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* util.h (gnupg_isotime_t): New.
|
||||
|
|
|
@ -32,49 +32,6 @@
|
|||
#include "util.h"
|
||||
#include "errors.h"
|
||||
|
||||
/* Note: we might want to wrap this in a macro to get our hands on
|
||||
the line and file where the error occured */
|
||||
int
|
||||
map_ksba_err (int err)
|
||||
{
|
||||
switch (err)
|
||||
{
|
||||
case 0:
|
||||
break;
|
||||
|
||||
case -1: err = GPG_ERR_EOF; break;
|
||||
case KSBA_Out_Of_Core: err = GPG_ERR_ENOMEM; break;
|
||||
case KSBA_Invalid_Value: err = GPG_ERR_INV_VALUE; break;
|
||||
case KSBA_Not_Implemented: err = GPG_ERR_NOT_IMPLEMENTED; break;
|
||||
case KSBA_Conflict: err = GPG_ERR_CONFLICT; break;
|
||||
case KSBA_Read_Error: err = GPG_ERR_EIO; break;
|
||||
case KSBA_Write_Error: err = GPG_ERR_EIO; break;
|
||||
case KSBA_No_Data: err = GPG_ERR_NO_DATA; break;
|
||||
case KSBA_Bug: err = GPG_ERR_BUG; break;
|
||||
case KSBA_Unsupported_Algorithm: err = GPG_ERR_UNSUPPORTED_ALGORITHM; break;
|
||||
case KSBA_Invalid_Index: err = GPG_ERR_INV_INDEX; break;
|
||||
case KSBA_Invalid_Sexp: err = GPG_ERR_INV_SEXP; break;
|
||||
case KSBA_Unknown_Sexp: err = GPG_ERR_UNKNOWN_SEXP; break;
|
||||
|
||||
default:
|
||||
err = GPG_ERR_GENERAL;
|
||||
break;
|
||||
}
|
||||
return gpg_err_make (GPG_ERR_SOURCE_GPGSM, err);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
map_gcry_err (int err)
|
||||
{
|
||||
return err;
|
||||
}
|
||||
|
||||
int
|
||||
map_kbx_err (int err)
|
||||
{
|
||||
return err;
|
||||
}
|
||||
|
||||
/* Map Assuan error code ERR to an GPG_ERR_ code. We need to
|
||||
distinguish between genuine (and legacy) Assuan error codes and
|
||||
|
|
|
@ -58,8 +58,6 @@ typedef char gnupg_isotime_t[16];
|
|||
|
||||
|
||||
/*-- maperror.c --*/
|
||||
int map_ksba_err (int err);
|
||||
int map_gcry_err (int err);
|
||||
int map_kbx_err (int err);
|
||||
gpg_error_t map_assuan_err (int err);
|
||||
int map_to_assuan_status (int rc);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue