mirror of
				https://github.com/cuberite/polarssl.git
				synced 2025-11-04 04:32:24 -05:00 
			
		
		
		
	Fix name conflict and implicit use of functions from string.h
This commit is contained in:
		
							parent
							
								
									7a0d84fccc
								
							
						
					
					
						commit
						67735d540b
					
				@ -1,5 +1,6 @@
 | 
				
			|||||||
/* BEGIN_HEADER */
 | 
					/* BEGIN_HEADER */
 | 
				
			||||||
#include "mbedtls/ctr_drbg.h"
 | 
					#include "mbedtls/ctr_drbg.h"
 | 
				
			||||||
 | 
					#include "string.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int test_offset_idx;
 | 
					static int test_offset_idx;
 | 
				
			||||||
static int mbedtls_test_entropy_func( void *data, unsigned char *buf, size_t len )
 | 
					static int mbedtls_test_entropy_func( void *data, unsigned char *buf, size_t len )
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,6 @@
 | 
				
			|||||||
/* BEGIN_HEADER */
 | 
					/* BEGIN_HEADER */
 | 
				
			||||||
#include "mbedtls/debug.h"
 | 
					#include "mbedtls/debug.h"
 | 
				
			||||||
 | 
					#include "string.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct buffer_data
 | 
					struct buffer_data
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,7 @@
 | 
				
			|||||||
/* BEGIN_HEADER */
 | 
					/* BEGIN_HEADER */
 | 
				
			||||||
#include "mbedtls/entropy.h"
 | 
					#include "mbedtls/entropy.h"
 | 
				
			||||||
#include "mbedtls/entropy_poll.h"
 | 
					#include "mbedtls/entropy_poll.h"
 | 
				
			||||||
 | 
					#include "string.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Number of calls made to entropy_dummy_source()
 | 
					 * Number of calls made to entropy_dummy_source()
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,6 @@
 | 
				
			|||||||
/* BEGIN_HEADER */
 | 
					/* BEGIN_HEADER */
 | 
				
			||||||
#include "mbedtls/hmac_drbg.h"
 | 
					#include "mbedtls/hmac_drbg.h"
 | 
				
			||||||
 | 
					#include "string.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
typedef struct
 | 
					typedef struct
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
				
			|||||||
@ -6,6 +6,7 @@
 | 
				
			|||||||
#include "mbedtls/pem.h"
 | 
					#include "mbedtls/pem.h"
 | 
				
			||||||
#include "mbedtls/oid.h"
 | 
					#include "mbedtls/oid.h"
 | 
				
			||||||
#include "mbedtls/base64.h"
 | 
					#include "mbedtls/base64.h"
 | 
				
			||||||
 | 
					#include "string.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if MBEDTLS_X509_MAX_INTERMEDIATE_CA > 19
 | 
					#if MBEDTLS_X509_MAX_INTERMEDIATE_CA > 19
 | 
				
			||||||
#error "The value of MBEDTLS_X509_MAX_INTERMEDIATE_C is larger \
 | 
					#error "The value of MBEDTLS_X509_MAX_INTERMEDIATE_C is larger \
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user