gcrypt: Simplify init_random_seed_or_die().

[paraslash.git] / gcrypt.c

diff --git a/gcrypt.c b/gcrypt.c
index f4dbeb8e32c7aee89a5d1b6bd6444811616a0a8c..5202c9b713eba8eba300d9ef336ffeae801ba03b 100644 (file)
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -64,15 +64,13 @@ void get_random_bytes_or_die(unsigned char *buf, int num)
  */
 void init_random_seed_or_die(void)
 {
-       const char *ver, *req_ver;
-
-       ver = gcry_check_version(NULL);
-       req_ver = "1.5.0";
-       if (!gcry_check_version(req_ver)) {
-               PARA_EMERG_LOG("fatal: need at least libgcrypt-%s, have: %s\n",
-                       req_ver, ver);
-               exit(EXIT_FAILURE);
-       }
+       const char *req_ver = "1.5.0";
+
+       if (gcry_check_version(req_ver))
+               return;
+       PARA_EMERG_LOG("fatal: need at least libgcrypt-%s, have: %s\n",
+               req_ver, gcry_check_version(NULL));
+       exit(EXIT_FAILURE);
 }
 
 /** S-expression for the public part of an RSA key. */
@@ -601,10 +599,8 @@ static int decode_rsa(gcry_sexp_t sexp, unsigned char *outbuf, size_t *nbytes)
 {
        const char *p = gcry_sexp_nth_data(sexp, 1, nbytes);
 
-       if (!p) {
-               PARA_ERROR_LOG("could not get data from list\n");
-               return -E_OEAP;
-       }
+       if (!p)
+               return -E_RSA_DECODE;
        memcpy(outbuf, p, *nbytes);
        return 1;
 }