mirror of
				https://github.com/cuberite/polarssl.git
				synced 2025-10-30 19:20:40 -04:00 
			
		
		
		
	Move SHA256_VALIDATE[_RET] outside of MBEDTLS_SHA256_ALT guard
Somehow, mbedtls_sha256_ret() is defined even if MBEDTLS_SHA256_ALT is set, and it is using SHA256_VALIDATE_RET. The documentation should be enhanced to indicate that MBEDTLS_SHA256_ALT does _not_ replace the entire module, but only the core SHA-256 functions.
This commit is contained in:
		
							parent
							
								
									d8e4f4a764
								
							
						
					
					
						commit
						2f6de42622
					
				| @ -49,6 +49,10 @@ | |||||||
| #endif /* MBEDTLS_PLATFORM_C */ | #endif /* MBEDTLS_PLATFORM_C */ | ||||||
| #endif /* MBEDTLS_SELF_TEST */ | #endif /* MBEDTLS_SELF_TEST */ | ||||||
| 
 | 
 | ||||||
|  | #define SHA256_VALIDATE_RET(cond)                           \ | ||||||
|  |     MBEDTLS_INTERNAL_VALIDATE_RET( cond, MBEDTLS_ERR_SHA256_BAD_INPUT_DATA ) | ||||||
|  | #define SHA256_VALIDATE(cond)  MBEDTLS_INTERNAL_VALIDATE( cond ) | ||||||
|  | 
 | ||||||
| #if !defined(MBEDTLS_SHA256_ALT) | #if !defined(MBEDTLS_SHA256_ALT) | ||||||
| 
 | 
 | ||||||
| /*
 | /*
 | ||||||
| @ -74,10 +78,6 @@ do {                                                    \ | |||||||
| } while( 0 ) | } while( 0 ) | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| #define SHA256_VALIDATE_RET(cond)                           \ |  | ||||||
|     MBEDTLS_INTERNAL_VALIDATE_RET( cond, MBEDTLS_ERR_SHA256_BAD_INPUT_DATA ) |  | ||||||
| #define SHA256_VALIDATE(cond)  MBEDTLS_INTERNAL_VALIDATE( cond ) |  | ||||||
| 
 |  | ||||||
| void mbedtls_sha256_init( mbedtls_sha256_context *ctx ) | void mbedtls_sha256_init( mbedtls_sha256_context *ctx ) | ||||||
| { | { | ||||||
|     SHA256_VALIDATE( ctx != NULL ); |     SHA256_VALIDATE( ctx != NULL ); | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Hanno Becker
						Hanno Becker