diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2021-11-22 18:20:29 -0700 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2021-11-22 18:20:29 -0700 |
| commit | 9b7d799cadf5d17b408b52d948bfb05d96e01c12 (patch) | |
| tree | 343385081ee9c69da9030805579164da2adda1eb | |
| parent | 2adddd4261eeefe058b529ed0b9af6b2d497aa67 (diff) | |
| download | alpine-9b7d799cadf5d17b408b52d948bfb05d96e01c12.tar.xz | |
* Rename the hmac() function in imap/src/c-client/hmac.c to c_client_hmac
to avoid redefinition, as some systems include the hmac() function in
stdlib.h. Reported by Hisashi Fujinaka.
| -rw-r--r-- | imap/src/c-client/hmac.c | 2 | ||||
| -rw-r--r-- | imap/src/c-client/sha.h | 2 | ||||
| -rw-r--r-- | pith/pine.hlp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/imap/src/c-client/hmac.c b/imap/src/c-client/hmac.c index 431026db..1b5344d4 100644 --- a/imap/src/c-client/hmac.c +++ b/imap/src/c-client/hmac.c @@ -35,7 +35,7 @@ * sha Error Code. * */ -int hmac(SHAversion whichSha, const unsigned char *text, int text_len, +int c_client_hmac(SHAversion whichSha, const unsigned char *text, int text_len, const unsigned char *key, int key_len, uint8_t digest[USHAMaxHashSize]) { diff --git a/imap/src/c-client/sha.h b/imap/src/c-client/sha.h index ffd4b7cf..e21c9844 100644 --- a/imap/src/c-client/sha.h +++ b/imap/src/c-client/sha.h @@ -238,7 +238,7 @@ extern int USHAHashSizeBits(enum SHAversion whichSha); * for all SHAs. * This interface allows a fixed-length text input to be used. */ -extern int hmac(SHAversion whichSha, /* which SHA algorithm to use */ +extern int c_client_hmac(SHAversion whichSha, /* which SHA algorithm to use */ const unsigned char *text, /* pointer to data stream */ int text_len, /* length of data stream */ const unsigned char *key, /* pointer to authentication key */ diff --git a/pith/pine.hlp b/pith/pine.hlp index 858dc012..cc8c8f55 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 620 2021-11-21 22:53:35 +Alpine Commit 621 2021-11-22 18:19:28 ============= h_news ================= <HTML> <HEAD> |