diff options
| author | Werner Koch <[email protected]> | 2008-09-29 15:02:55 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2008-09-29 15:02:55 +0000 |
| commit | 7d63aa42e5d2c086810e3d7eca64a01f366b4e88 (patch) | |
| tree | 7dccaebaa7f86d56fef8beb00eb9c2bc583ede20 /agent | |
| parent | 2008-09-28 Marcus Brinkmann <[email protected]> (diff) | |
| download | gnupg-7d63aa42e5d2c086810e3d7eca64a01f366b4e88.tar.gz gnupg-7d63aa42e5d2c086810e3d7eca64a01f366b4e88.zip | |
Remove hacks which are not anymore needed since we now require Libgcrypt 1.4
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/ChangeLog | 6 | ||||
| -rw-r--r-- | agent/agent.h | 6 | ||||
| -rw-r--r-- | agent/command.c | 4 | ||||
| -rw-r--r-- | agent/divert-scd.c | 2 | ||||
| -rw-r--r-- | agent/pksign.c | 2 |
5 files changed, 13 insertions, 7 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index 9711cd171..e076675ae 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,9 @@ +2008-09-29 Werner Koch <[email protected]> + + * agent.h (GCRY_MD_USER): Rename to GCRY_MODULE_ID_USER. + (GCRY_MD_USER_TLS_MD5SHA1): Rename to MD_USER_TLS_MD5SHA1 and + change all users. + 2008-09-25 Werner Koch <[email protected]> * divert-scd.c (getpin_cb): Support a Reset Code style PINs.. diff --git a/agent/agent.h b/agent/agent.h index bf460b485..6a66add3f 100644 --- a/agent/agent.h +++ b/agent/agent.h @@ -36,10 +36,10 @@ /* To convey some special hash algorithms we use algorithm numbers reserved for application use. */ -#ifndef GCRY_MD_USER -#define GCRY_MD_USER 1024 +#ifndef GCRY_MODULE_ID_USER +#define GCRY_MODULE_ID_USER 1024 #endif -#define GCRY_MD_USER_TLS_MD5SHA1 (GCRY_MD_USER+1) +#define MD_USER_TLS_MD5SHA1 (GCRY_MODULE_ID_USER+1) /* Maximum length of a digest. */ #define MAX_DIGEST_LEN 36 diff --git a/agent/command.c b/agent/command.c index c7853a92c..f6bfaa64a 100644 --- a/agent/command.c +++ b/agent/command.c @@ -597,7 +597,7 @@ cmd_sethash (assuan_context_t ctx, char *line) else if (has_option (line, "--hash=md5")) algo = GCRY_MD_MD5; else if (has_option (line, "--hash=tls-md5sha1")) - algo = GCRY_MD_USER_TLS_MD5SHA1; + algo = MD_USER_TLS_MD5SHA1; else return set_error (GPG_ERR_ASS_PARAMETER, "invalid hash algorithm"); } @@ -622,7 +622,7 @@ cmd_sethash (assuan_context_t ctx, char *line) if (rc) return rc; n /= 2; - if (algo == GCRY_MD_USER_TLS_MD5SHA1 && n == 36) + if (algo == MD_USER_TLS_MD5SHA1 && n == 36) ; else if (n != 16 && n != 20 && n != 24 && n != 32) return set_error (GPG_ERR_ASS_PARAMETER, "unsupported length of hash"); diff --git a/agent/divert-scd.c b/agent/divert-scd.c index b19302496..fc96fd1ca 100644 --- a/agent/divert-scd.c +++ b/agent/divert-scd.c @@ -335,7 +335,7 @@ divert_pksign (ctrl_t ctrl, if (rc) return rc; - if (algo == GCRY_MD_USER_TLS_MD5SHA1) + if (algo == MD_USER_TLS_MD5SHA1) { int save = ctrl->use_auth_call; ctrl->use_auth_call = 1; diff --git a/agent/pksign.c b/agent/pksign.c index 2973fb837..926438e87 100644 --- a/agent/pksign.c +++ b/agent/pksign.c @@ -181,7 +181,7 @@ agent_pksign_do (ctrl_t ctrl, const char *desc_text, gcry_sexp_t s_hash = NULL; /* Put the hash into a sexp */ - if (ctrl->digest.algo == GCRY_MD_USER_TLS_MD5SHA1) + if (ctrl->digest.algo == MD_USER_TLS_MD5SHA1) rc = do_encode_raw_pkcs1 (ctrl->digest.value, ctrl->digest.valuelen, gcry_pk_get_nbits (s_skey), |