diff options
author | Christian Grothoff <christian@grothoff.org> | 2008-10-12 22:12:05 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2008-10-12 22:12:05 +0000 |
commit | 33b93e08da883c7180bc268f5be30acc26139326 (patch) | |
tree | 95f29c294c4792bdb8dfe873f084f9232ff3e65e /src/daemon/https/x509/pkcs12_encr.c | |
parent | f7947e0ad9a7cc4c770b149699f2ef096278c062 (diff) | |
download | libmicrohttpd-33b93e08da883c7180bc268f5be30acc26139326.tar.gz libmicrohttpd-33b93e08da883c7180bc268f5be30acc26139326.zip |
more dead code and warning elimination
Diffstat (limited to 'src/daemon/https/x509/pkcs12_encr.c')
-rw-r--r-- | src/daemon/https/x509/pkcs12_encr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/daemon/https/x509/pkcs12_encr.c b/src/daemon/https/x509/pkcs12_encr.c index b50520e7..0cfb59e5 100644 --- a/src/daemon/https/x509/pkcs12_encr.c +++ b/src/daemon/https/x509/pkcs12_encr.c | |||
@@ -35,7 +35,7 @@ | |||
35 | static int | 35 | static int |
36 | MHD_pkcs12_check_pass (const char *pass, size_t plen) | 36 | MHD_pkcs12_check_pass (const char *pass, size_t plen) |
37 | { | 37 | { |
38 | const unsigned char *p = pass; | 38 | const char *p = pass; |
39 | unsigned int i; | 39 | unsigned int i; |
40 | 40 | ||
41 | for (i = 0; i < plen; i++) | 41 | for (i = 0; i < plen; i++) |
@@ -115,13 +115,13 @@ MHD_pkcs12_string_to_key (unsigned int id, const opaque * salt, | |||
115 | for (i = 0; i < 64; i++) | 115 | for (i = 0; i < 64; i++) |
116 | { | 116 | { |
117 | unsigned char lid = id & 0xFF; | 117 | unsigned char lid = id & 0xFF; |
118 | MHD_gc_hash_write (md, 1, &lid); | 118 | MHD_gc_hash_write (md, 1, (const char*) &lid); |
119 | } | 119 | } |
120 | MHD_gc_hash_write (md, pw ? 128 : 64, buf_i); | 120 | MHD_gc_hash_write (md, pw ? 128 : 64, (const char*) buf_i); |
121 | memcpy (hash, MHD_gc_hash_read (md), 20); | 121 | memcpy (hash, MHD_gc_hash_read (md), 20); |
122 | MHD_gc_hash_close (md); | 122 | MHD_gc_hash_close (md); |
123 | for (i = 1; i < iter; i++) | 123 | for (i = 1; i < iter; i++) |
124 | MHD_gc_hash_buffer (GC_SHA1, hash, 20, hash); | 124 | MHD_gc_hash_buffer (GC_SHA1, hash, 20, (char*) hash); |
125 | for (i = 0; i < 20 && cur_keylen < req_keylen; i++) | 125 | for (i = 0; i < 20 && cur_keylen < req_keylen; i++) |
126 | keybuf[cur_keylen++] = hash[i]; | 126 | keybuf[cur_keylen++] = hash[i]; |
127 | if (cur_keylen == req_keylen) | 127 | if (cur_keylen == req_keylen) |