X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=b8078770e5368c3840e0c6c91e3ff6267a7f7590;hp=26e6fe006a78653c6118ffc35f78eb8d44e4f604;hb=4e5c01fe757de01edfc6aee72697d6765ae0e1a9;hpb=3fe80106bf0dc11987be660db2a39f2cc0a692a4

diff --git a/error.h b/error.h
index 26e6fe00..b8078770 100644
--- a/error.h
+++ b/error.h
@@ -19,7 +19,6 @@ DEFINE_ERRLIST_OBJECT_ENUM;
 #define GUI_ERRORS
 #define RINGBUFFER_ERRORS
 #define SCORE_ERRORS
-#define SHA1_ERRORS
 #define RBTREE_ERRORS
 #define RECV_ERRORS
 #define IPC_ERRORS
@@ -112,7 +111,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(AO_APPEND_OPTION, "ao append option: memory allocation failure"), \
 	PARA_ERROR(AO_OPEN_LIVE, "ao: could not open audio device"), \
 	PARA_ERROR(AO_FILE_NOT_SUPP, "ao: file io drivers not supported"), \
-	PARA_ERROR(AO_EOF, "ao: end of file"), \
 	PARA_ERROR(AO_PLAY, "ao_play() failed"), \
 	PARA_ERROR(AO_BAD_SAMPLE_FORMAT, "ao: unsigned sample formats not supported"), \
 	PARA_ERROR(AO_PTHREAD, "pthread error"), \
@@ -370,6 +368,12 @@ extern const char **para_errlist[];
 	PARA_ERROR(AFS_SHORT_READ, "short read from afs socket"), \
 
 
+#define CRYPT_COMMON_ERRORS \
+	PARA_ERROR(SSH_KEY_HEADER, "ssh key header not found"), \
+	PARA_ERROR(BASE64, "failed to base64-decode ssh public key"), \
+	PARA_ERROR(KEY_PERM, "unprotected private key"), \
+
+
 #define CRYPT_ERRORS \
 	PARA_ERROR(PRIVATE_KEY, "can not read private key"), \
 	PARA_ERROR(PUBLIC_KEY, "can not read public key"), \
@@ -377,7 +381,22 @@ extern const char **para_errlist[];
 	PARA_ERROR(ENCRYPT, "encrypt error"), \
 	PARA_ERROR(DECRYPT, "decrypt error"), \
 	PARA_ERROR(BLINDING, "failed to activate key blinding"), \
-	PARA_ERROR(KEY_PERM, "unprotected private key"), \
+	PARA_ERROR(BIGNUM, "bignum error"), \
+
+#define GCRYPT_ERRORS \
+	PARA_ERROR(MPI_SCAN, "could not scan multi-precision integer"), \
+	PARA_ERROR(MPI_PRINT, "could not convert multi-precision integer"), \
+	PARA_ERROR(SEXP_FIND, "could not find sublist in S-expression"), \
+	PARA_ERROR(SEXP_BUILD, "could not build S-expression"), \
+	PARA_ERROR(SEXP_ENCRYPT, "could not encrypt S-expression"), \
+	PARA_ERROR(SEXP_DECRYPT, "could not decrypt S-expression"), \
+	PARA_ERROR(MD_OPEN, "could not open message digest object"), \
+	PARA_ERROR(CIPHER_OPEN, "could not create stream cipher handle"), \
+	PARA_ERROR(BAD_PRIVATE_KEY, "invalid private key"), \
+	PARA_ERROR(KEY_MARKER, "invalid/missing key header or footer"), \
+	PARA_ERROR(ASN1_PARSE, "could not parse ASN.1 key"), \
+	PARA_ERROR(SSH_PARSE, "could not parse ssh public key"), \
+	PARA_ERROR(OEAP, "error during oeap (un)padding"), \
 
 
 #define COMMAND_ERRORS \