feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #620 from JacobBarthelmeh/PKCS12

Browse Source 
PKCS12 : visibility of structs and guards
This commit is contained in:
Chris Conlon
2016-11-09 08:59:31 -07:00
committed by GitHub
parent e9cda7b93f fa48bca262
commit af44b2527a
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wolfcrypt/src/pkcs12.c
View File

@ -55,10 +55,9 @@ enum {
WC_PKCS12_ENCRYPTED_DATA = 656, WC_PKCS12_ENCRYPTED_DATA = 656,
}; };
typedef struct ContentInfo ContentInfo;
typedef struct ContentInfo { typedef struct ContentInfo {
byte* data; byte* data;
ContentInfo* next; struct ContentInfo* next;
word32 encC; /* encryptedContent */ word32 encC; /* encryptedContent */
word32 dataSz; word32 dataSz;
int type; /* DATA / encrypted / envelpoed */ int type; /* DATA / encrypted / envelpoed */
@ -84,12 +83,12 @@ typedef struct MacData {
} MacData; } MacData;
typedef struct WC_PKCS12 { struct WC_PKCS12 {
void* heap; void* heap;
AuthenticatedSafe* safe; AuthenticatedSafe* safe;
MacData* signData; MacData* signData;
word32 oid; /* DATA / Enveloped DATA ... */ word32 oid; /* DATA / Enveloped DATA ... */
} WC_PKCS12; };
/* for friendlyName, localKeyId .... */ /* for friendlyName, localKeyId .... */

4
wolfssl/internal.h
View File

@ -2486,7 +2486,7 @@ typedef struct Arrays {
#define MAX_DATE_SZ 32 #define MAX_DATE_SZ 32
#endif #endif
typedef struct WOLFSSL_STACK { struct WOLFSSL_STACK {
unsigned long num; /* number of nodes in stack unsigned long num; /* number of nodes in stack
* (saftey measure for freeing and shortcut for count) */ * (saftey measure for freeing and shortcut for count) */
union { union {
@ -2494,7 +2494,7 @@ typedef struct WOLFSSL_STACK {
WOLFSSL_BIO* bio; WOLFSSL_BIO* bio;
} data; } data;
WOLFSSL_STACK* next; WOLFSSL_STACK* next;
} WOLFSSL_STACK; };
struct WOLFSSL_X509_NAME { struct WOLFSSL_X509_NAME {

8
wolfssl/wolfcrypt/pkcs12.h
View File

@ -29,12 +29,14 @@
extern "C" { extern "C" {
#endif #endif
typedef struct WC_PKCS12 WC_PKCS12; #ifndef WOLFSSL_TYPES_DEFINED /* do not redeclare from ssl.h */
typedef struct WC_DerCertList WC_DerCertList; typedef struct WC_PKCS12 WC_PKCS12;
#endif
typedef struct WC_DerCertList { /* dereferenced in ssl.c */ typedef struct WC_DerCertList { /* dereferenced in ssl.c */
byte* buffer; byte* buffer;
word32 bufferSz; word32 bufferSz;
WC_DerCertList* next; struct WC_DerCertList* next;
} WC_DerCertList; } WC_DerCertList;