Samsung: fix incorrect conflict resolution

0xc0170 · RyoheiHagimoto · commit eef172888613 · 2020-03-31T13:37:26.000+09:00
diff --git a/features/mbedtls/targets/TARGET_Samsung/sha/sha512_alt.c b/features/mbedtls/targets/TARGET_Samsung/sha/sha512_alt.c
@@ -243,19 +243,8 @@ int mbedtls_sha512_finish_ret(mbedtls_sha512_context *ctx, unsigned char output[
         if (ret != SSSR_SUCCESS) {
             return ret;
         }
-
-<<<<<<< cd37b0cf8e0be356705b7c17c0871c8f3acc03fa
     }
-=======
-		//! step 3 : get hash result from SSS
-		ret = mb_hash_final(&stHASH_Input, &ctx->pstDigest);
-
-		if (ret != SSSR_SUCCESS) {
-			return ret;
-		}
 
-	}
->>>>>>> tidy up PR comments #3
     return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -243,19 +243,8 @@ int mbedtls_sha512_finish_ret(mbedtls_sha512_context *ctx, unsigned char output[`
`243`	`243`	`if (ret != SSSR_SUCCESS) {`
`244`	`244`	`return ret;`
`245`	`245`	`}`
`246`		`-`
`247`		`-<<<<<<< cd37b0cf8e0be356705b7c17c0871c8f3acc03fa`
`248`	`246`	`}`
`249`		`-=======`
`250`		`- //! step 3 : get hash result from SSS`
`251`		`- ret = mb_hash_final(&stHASH_Input, &ctx->pstDigest);`
`252`		`-`
`253`		`- if (ret != SSSR_SUCCESS) {`
`254`		`- return ret;`
`255`		`- }`
`256`	`247`
`257`		`- }`
`258`		`->>>>>>> tidy up PR comments #3`
`259`	`248`	`return 0;`
`260`	`249`	`}`
`261`	`250`