mirror of https://github.com/openssl/openssl.git
				
				
				
			Update from fips2 branch.
This commit is contained in:
		
							parent
							
								
									357d5de5b9
								
							
						
					
					
						commit
						af32f9fdda
					
				|  | @ -62,7 +62,7 @@ | ||||||
| #include <openssl/buffer.h> | #include <openssl/buffer.h> | ||||||
| #include "bn_lcl.h" | #include "bn_lcl.h" | ||||||
| 
 | 
 | ||||||
| static const char *Hex="0123456789ABCDEF"; | static const char Hex[]="0123456789ABCDEF"; | ||||||
| 
 | 
 | ||||||
| /* Must 'OPENSSL_free' the returned data */ | /* Must 'OPENSSL_free' the returned data */ | ||||||
| char *BN_bn2hex(const BIGNUM *a) | char *BN_bn2hex(const BIGNUM *a) | ||||||
|  |  | ||||||
|  | @ -125,7 +125,7 @@ DECLARE_STACK_OF(CRYPTO_dynlock) | ||||||
| IMPLEMENT_STACK_OF(CRYPTO_dynlock) | IMPLEMENT_STACK_OF(CRYPTO_dynlock) | ||||||
| 
 | 
 | ||||||
| /* real #defines in crypto.h, keep these upto date */ | /* real #defines in crypto.h, keep these upto date */ | ||||||
| static const char* lock_names[CRYPTO_NUM_LOCKS] = | static const char* const lock_names[CRYPTO_NUM_LOCKS] = | ||||||
| 	{ | 	{ | ||||||
| 	"<<ERROR>>", | 	"<<ERROR>>", | ||||||
| 	"err", | 	"err", | ||||||
|  |  | ||||||
|  | @ -365,7 +365,7 @@ char *hex_to_string(unsigned char *buffer, long len) | ||||||
| 	char *tmp, *q; | 	char *tmp, *q; | ||||||
| 	unsigned char *p; | 	unsigned char *p; | ||||||
| 	int i; | 	int i; | ||||||
| 	static char hexdig[] = "0123456789ABCDEF"; | 	const static char hexdig[] = "0123456789ABCDEF"; | ||||||
| 	if(!buffer || !len) return NULL; | 	if(!buffer || !len) return NULL; | ||||||
| 	if(!(tmp = OPENSSL_malloc(len * 3 + 1))) { | 	if(!(tmp = OPENSSL_malloc(len * 3 + 1))) { | ||||||
| 		X509V3err(X509V3_F_HEX_TO_STRING,ERR_R_MALLOC_FAILURE); | 		X509V3err(X509V3_F_HEX_TO_STRING,ERR_R_MALLOC_FAILURE); | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue