lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

POLARSSL_PEM_C split into POLARSSL_PEM_PARSE_C and POLARSSL_PEM_WRITE_C

Browse Source
This commit is contained in:
Paul Bakker
2013-09-15 20:43:33 +02:00
parent 77e23fb0e0
commit cff6842b39
14 changed files with 242 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/pkparse.c
View File

@ -40,7 +40,7 @@
#if defined(POLARSSL_ECDSA_C)
#include "polarssl/ecdsa.h"
#endif
#if defined(POLARSSL_PEM_C)
#if defined(POLARSSL_PEM_PARSE_C)
#include "polarssl/pem.h"
#endif
#if defined(POLARSSL_PKCS5_C)
@ -754,7 +754,7 @@ int pk_parse_key( pk_context *pk,
int ret;
const pk_info_t *pk_info;
#if defined(POLARSSL_PEM_C)
#if defined(POLARSSL_PEM_PARSE_C)
size_t len;
pem_context pem;
@ -855,7 +855,7 @@ int pk_parse_key( pk_context *pk,
#else
((void) pwd);
((void) pwdlen);
#endif /* POLARSSL_PEM_C */
#endif /* POLARSSL_PEM_PARSE_C */
/*
* At this point we only know it's not a PEM formatted key. Could be any
@ -919,7 +919,7 @@ int pk_parse_public_key( pk_context *ctx,
{
int ret;
unsigned char *p;
#if defined(POLARSSL_PEM_C)
#if defined(POLARSSL_PEM_PARSE_C)
size_t len;
pem_context pem;
@ -947,7 +947,7 @@ int pk_parse_public_key( pk_context *ctx,
ret = pk_parse_get_pubkey( &p, p + keylen, ctx );
#if defined(POLARSSL_PEM_C)
#if defined(POLARSSL_PEM_PARSE_C)
pem_free( &pem );
#endif