Merge pull request #3 from kuixiao/bug_fix_sha1

bug fix: invalid signature when private key is beyong 64 bytes.

Author: joydchh

examples/file.c

@@ -8,13 +8,15 @@
 #include "helper.h"
 #define fourMegabyte 1 << 22 //4M
 
+const char region[20] = "cn-sh2";
+
 int main(int argc, char *argv[]){
     // 读取配置初始化SDK
     struct ufile_config cfg;
     cfg.public_key = getenv("UFILE_PUBLIC_KEY");
     cfg.private_key = getenv("UFILE_PRIVATE_KEY");
-    cfg.bucket_host = "api.ucloud.cn";
-    cfg.file_host = "www.internal-vn-sng.ufileos.com";
+    cfg.bucket_host = getenv("UFILE_BUCKET_HOST");
+    cfg.file_host = getenv("UFILE_FILE_HOST");
     struct ufile_error error;
     error = ufile_sdk_initialize(cfg, 0);
     if(UFILE_HAS_ERROR(error.code)){
@@ -28,7 +30,7 @@ int main(int argc, char *argv[]){
     struct timeval start;
     gettimeofday( &start, NULL );
     sprintf(bucket_name,"%d",start.tv_sec);
-    error = ufile_bucket_create(bucket_name, "vn-sng", "private");
+    error = ufile_bucket_create(bucket_name, region, "private");
     if(UFILE_HAS_ERROR(error.code)){
         printf("创建 bucket 失败，错误信息为：%s\n", error.message);
     }else{
@@ -88,4 +90,4 @@ int main(int argc, char *argv[]){
 
     ufile_sdk_cleanup();
     return 0;
-}
+}

examples/file_mput.c

@@ -12,7 +12,7 @@ int main(int argc, char *argv[]){
     char* bucket_name = argv[1];
     char* key_name = argv[2];
     char* file_path = argv[3];
-    char* mime_type = NULL;
+    char* mime_type = "";
     if (argc > 4) {
        mime_type = argv[4];
     }

examples/file_put_buf.c

@@ -27,7 +27,7 @@ int main(int argc, char *argv[]){
     char* bucket_name = argv[1];
     char* key_name = argv[2];
     char* contents = argv[3];
-    char* mime_type = NULL;
+    char* mime_type = "";
     if (argc > 4) {
        mime_type = argv[4];
     }

examples/file_put_file.c

@@ -13,7 +13,7 @@ int main(int argc, char *argv[]){
     char* bucket_name = argv[1];
     char* key_name = argv[2];
     char* file_path = argv[3];
-    char* mime_type = NULL;
+    char* mime_type = "";
     if (argc > 4) {
        mime_type = argv[4];
     }
@@ -51,4 +51,4 @@ int main(int argc, char *argv[]){
     fclose(fp);
     ufile_sdk_cleanup();
     return 0;
-}
+}

lib/encoding.c

@@ -510,24 +510,29 @@ void HMAC_SHA1(unsigned char hmac[HMAC_LEN], const unsigned char *key, int key_l
     unsigned char kopad[64], kipad[64];
     int i;
 
+    // sha1 输出一个长度为 20 bytes 的摘要 
+    unsigned char digest[20];
+    SHA1Context context; 
+    char sha1_key[key_len];
+    strcpy(sha1_key, key);
     if (key_len > 64) {
-        key_len = 64;
+        SHA1_init(&context);
+        SHA1_update(&context, sha1_key, key_len);
+        SHA1_final(digest, &context);
+        strcpy(sha1_key, digest);
+        key_len = 20;
     }
 
     for (i = 0; i < key_len; i++) {
-        kopad[i] = key[i] ^ 0x5c;
-        kipad[i] = key[i] ^ 0x36;
+        kopad[i] = sha1_key[i] ^ 0x5c;
+        kipad[i] = sha1_key[i] ^ 0x36;
     }
 
     for ( ; i < 64; i++) {
         kopad[i] = 0 ^ 0x5c;
         kipad[i] = 0 ^ 0x36;
     }
 
-    unsigned char digest[20];
-
-    SHA1Context context;
-
     SHA1_init(&context);
     SHA1_update(&context, kipad, 64);
     SHA1_update(&context, message, message_len);