fix security methods

Author: shshjing

VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/Common/Utils/Encryption/VPUPMD5Util.m

@@ -15,15 +15,22 @@
 @implementation VPUPMD5Util
 
 + (NSString *)md5HashString:(NSString *)string {
-    unsigned char *hashStr = (unsigned char *)malloc(sizeof(unsigned char) * (CC_MD5_DIGEST_LENGTH * 2 + 1));
 
-    vpup_md5_encryption((char *)[string UTF8String], hashStr);
+    if (!string) {
+        return nil;
+    }
 
-    NSString *hashString = [NSString stringWithUTF8String:(char *)hashStr];
+    //要进行UTF8的转码
+    const char* input = [string UTF8String];
+    unsigned char result[CC_MD5_DIGEST_LENGTH];
+    CC_MD5(input, (CC_LONG)strlen(input), result);
 
-    free(hashStr);
+    NSMutableString *digest = [NSMutableString stringWithCapacity:CC_MD5_DIGEST_LENGTH * 2];
+    for (NSInteger i = 0; i < CC_MD5_DIGEST_LENGTH; i++) {
+        [digest appendFormat:@"%02x", result[i]];
+    }
 
-    return hashString;
+    return digest;
 }
 
 + (NSString *)md5_16bitHashString:(NSString *)string {

VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/Common/Utils/Encryption/VPUPRSAUtil.m

@@ -22,12 +22,22 @@ @implementation VPUPRSAUtil
  */
 
 static NSString *base64_encode_data(NSData *data){
+    
+    if (!data) {
+        return nil;
+    }
+    
     data = [data base64EncodedDataWithOptions:0];
     NSString *ret = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
     return ret;
 }
 
 static NSData *base64_decode(NSString *str){
+    
+    if (!str) {
+        return nil;
+    }
+    
     NSData *data = [[NSData alloc] initWithBase64EncodedString:str options:NSDataBase64DecodingIgnoreUnknownCharacters];
     return data;
 }

VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/Common/Utils/Encryption/VPUPSHAUtil.m

@@ -13,36 +13,68 @@
 @implementation VPUPSHAUtil
 
 + (NSString *)sha1HashString:(NSString *)string {
-    unsigned char *hashStr = (unsigned char *)malloc(sizeof(unsigned char) * (CC_SHA1_DIGEST_LENGTH * 2 + 1));
-    vpup_sha1_encryption((char *)[string UTF8String], hashStr);
 
-    NSString *hashString = [NSString stringWithUTF8String:(char *)hashStr];
+    if (!string) {
+        return nil;
+    }
 
-    free(hashStr);
+    NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding];
 
-    return hashString;
+    uint8_t digest[CC_SHA1_DIGEST_LENGTH];
+    
+    CC_SHA1(data.bytes, (unsigned int)data.length, digest);
+    
+    NSMutableString *output = [NSMutableString stringWithCapacity:CC_SHA1_DIGEST_LENGTH * 2];
+    
+    for(int i = 0; i < CC_SHA1_DIGEST_LENGTH; i++) {
+        [output appendFormat:@"%02x", digest[i]];
+    }
+    
+    return output;
 }
 
 + (NSString *)sha256HashString:(NSString *)string {
-    unsigned char *hashStr = (unsigned char *)malloc(sizeof(unsigned char) * (CC_SHA256_DIGEST_LENGTH * 2 + 1));
-    vpup_sha256_encryption((char *)[string UTF8String], hashStr);
-    NSString *hashString = [NSString stringWithUTF8String:(char *)hashStr];
 
-    free(hashStr);
+    if (!string) {
+        return nil;
+    }
+    
+    NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding];
+    
+    uint8_t digest[CC_SHA256_DIGEST_LENGTH];
+    
+    CC_SHA256(data.bytes, (unsigned int)data.length, digest);
 
-    return hashString;
+    NSMutableString *output = [NSMutableString stringWithCapacity:CC_SHA256_DIGEST_LENGTH * 2];
+    
+    for(int i = 0; i < CC_SHA256_DIGEST_LENGTH; i++) {
+        [output appendFormat:@"%02x", digest[i]];
+    }
+    
+    return output;
 }
 
 + (NSString *)hmac_sha1HashString:(NSString *)string key:(NSString *)hmacKey {
-    unsigned char *hashStr = (unsigned char *)malloc(sizeof(unsigned char) * (CC_SHA1_DIGEST_LENGTH * 2 + 1));
 
-    vpup_hmac_sha1_hex_encryption((char *)[hmacKey UTF8String], (char *)[string UTF8String], hashStr);
+    if (!string || !hmacKey) {
+        return nil;
+    }
+    
+    const char *cData = [string cStringUsingEncoding:NSUTF8StringEncoding];
+    
+    const char *cKey  = [hmacKey cStringUsingEncoding:NSUTF8StringEncoding];
+    
+    uint8_t cHMAC[CC_SHA1_DIGEST_LENGTH];
+    
+    CCHmac(kCCHmacAlgSHA1, cKey, strlen(cKey), cData, strlen(cData), cHMAC);
 
-    NSString *hashString = [NSString stringWithUTF8String:(char *)hashStr];
+    NSMutableString * output = [NSMutableString stringWithCapacity:CC_SHA1_DIGEST_LENGTH * 2];
 
-    free(hashStr);
+    for(int i = 0; i < CC_SHA1_DIGEST_LENGTH; i++) {
+        [output appendFormat:@"%02x", cHMAC[i]];
+    }
 
-    return hashString;
+    return output;
 }
 
 @end