PKCS #5 v1.5 encrypted key adds, small build fixes

This commit is contained in:
Todd A Ouska
2011-03-22 07:35:18 -07:00
parent b9ff110b2e
commit 680358abe1
11 changed files with 247 additions and 32 deletions

View File

@@ -255,10 +255,10 @@ enum Misc {
SIZEOF_SENDER = 4, /* clnt or srvr */
FINISHED_SZ = MD5_DIGEST_SIZE + SHA_DIGEST_SIZE,
MAX_RECORD_SIZE = 16384, /* 2^14, max size by standard */
MAX_UDP_SIZE = 1400, /* don't exceed MTU */
MAX_MSG_EXTRA = 68, /* max added to msg, mac + pad */
MAX_COMP_EXTRA = 1024, /* max compression extra */
MAX_MTU = 1500, /* max expected MTU */
MAX_UDP_SIZE = MAX_MTU - 100, /* don't exceed MTU w/ 100 byte header */
MAX_DH_SZ = 612, /* 2240 p, pub, g + 2 byte size for each */
MAX_STR_VERSION = 8, /* string rep of protocol version */
@@ -1027,10 +1027,11 @@ enum {
typedef struct EncryptedInfo {
char name[NAME_SZ];
byte iv[IV_SZ];
word32 ivSz;
byte set;
char name[NAME_SZ];
byte iv[IV_SZ];
word32 ivSz;
byte set;
SSL_CTX* ctx;
} EncryptedInfo;

View File

@@ -99,7 +99,8 @@
const char* eccCert = "../../certs/server-ecc.pem";
const char* eccKey = "../../certs/ecc-key.pem";
const char* svrCert = "../../certs/server-cert.pem";
const char* svrKey = "../../certs/server-key.pem";
//const char* svrKey = "../../certs/server-key.pem";
const char* svrKey = "../../certs/server-keyPkcs8Enc.pem";
const char* cliCert = "../../certs/client-cert.pem";
const char* cliKey = "../../certs/client-key.pem";
const char* ntruCert = "../../certs/ntru-cert.pem";
@@ -109,7 +110,8 @@
static const char* eccCert = "../certs/server-ecc.pem";
static const char* eccKey = "../certs/ecc-key.pem";
static const char* svrCert = "../certs/server-cert.pem";
static const char* svrKey = "../certs/server-key.pem";
//static const char* svrKey = "../certs/server-key.pem";
static const char* svrKey = "../certs/server-keyPkcs8Enc.pem";
static const char* cliCert = "../certs/client-cert.pem";
static const char* cliKey = "../certs/client-key.pem";
static const char* ntruCert = "../certs/ntru-cert.pem";