diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-02 18:52:13 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-02 18:52:13 +0000 |
| commit | cc1b2c100fc6dd44a690652ecd3c5788b0438ea7 (patch) | |
| tree | a3750d996d41e35c5df34c29533dd7d9fdcaff24 /res/res_crypto.c | |
| parent | 2d6e969e7c81afb0b050691b85f2bc74ca84ae62 (diff) | |
bring over all the fixes for the warnings found by gcc 4.3.x from the 1.4 branch, and add the ones needed for all the new code here too
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@153616 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_crypto.c')
| -rw-r--r-- | res/res_crypto.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/res/res_crypto.c b/res/res_crypto.c index f1a2234fd..e55abe891 100644 --- a/res/res_crypto.c +++ b/res/res_crypto.c @@ -106,7 +106,11 @@ static int pw_cb(char *buf, int size, int rwflag, void *userdata) snprintf(prompt, sizeof(prompt), ">>>> passcode for %s key '%s': ", key->ktype == AST_KEY_PRIVATE ? "PRIVATE" : "PUBLIC", key->name); - write(key->outfd, prompt, strlen(prompt)); + if (write(key->outfd, prompt, strlen(prompt)) < 0) { + ast_log(LOG_WARNING, "write() failed: %s\n", strerror(errno)); + key->infd = -2; + return -1; + } memset(buf, 0, sizeof(buf)); tmp = ast_hide_password(key->infd); memset(buf, 0, size); @@ -177,7 +181,9 @@ static struct ast_key *try_load_key(const char *dir, const char *fname, int ifd, while(!feof(f)) { /* Calculate a "whatever" quality md5sum of the key */ char buf[256] = ""; - fgets(buf, sizeof(buf), f); + if (!fgets(buf, sizeof(buf), f)) { + continue; + } if (!feof(f)) MD5Update(&md5, (unsigned char *) buf, strlen(buf)); } |