generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove deleted PKCS#12 functions from pkcs12.h, get rid of object creation

Browse Source 
kludge, remove CRs from ssl_ciph.c and update Win32 functions for PKCS#12
code. It might compile under Win32 now ...
This commit is contained in:
Dr. Stephen Henson
1999-03-29 22:18:54 +00:00
parent ee0508d411
commit bc37a6b81c
8 changed files with 95 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ssl/ssl_ciph.c
View File

@@ -617,7 +617,7 @@ SSL_CIPHER *cipher;
char *buf;
int len;
{
int is_export,pkl,kl;
int is_export,pkl,kl;
char *ver,*exp;
char *kx,*au,*enc,*mac;
unsigned long alg,alg2;
@@ -626,10 +626,10 @@ int len;
alg=cipher->algorithms;
alg2=cipher->algorithm2;
is_export=SSL_IS_EXPORT(alg);
is_export=SSL_IS_EXPORT(alg);
pkl=SSL_EXPORT_PKEYLENGTH(alg);
kl=SSL_EXPORT_KEYLENGTH(alg);
exp=is_export?" export":"";
exp=is_export?" export":"";
if (alg & SSL_SSLV2)
ver="SSLv2";
@@ -641,7 +641,7 @@ int len;
switch (alg&SSL_MKEY_MASK)
{
case SSL_kRSA:
kx=is_export?(pkl == 512 ? "RSA(512)" : "RSA(1024)"):"RSA";
kx=is_export?(pkl == 512 ? "RSA(512)" : "RSA(1024)"):"RSA";
break;
case SSL_kDHr:
kx="DH/RSA";
@@ -653,7 +653,7 @@ int len;
kx="Fortezza";
break;
case SSL_kEDH:
kx=is_export?(pkl == 512 ? "DH(512)" : "DH(1024)"):"DH";
kx=is_export?(pkl == 512 ? "DH(512)" : "DH(1024)"):"DH";
break;
default:
kx="unknown";
@@ -682,17 +682,17 @@ int len;
switch (alg&SSL_ENC_MASK)
{
case SSL_DES:
enc=(is_export && kl == 5)?"DES(40)":"DES(56)";
enc=(is_export && kl == 5)?"DES(40)":"DES(56)";
break;
case SSL_3DES:
enc="3DES(168)";
break;
case SSL_RC4:
enc=is_export?(kl == 5 ? "RC4(40)" : "RC4(56)")
enc=is_export?(kl == 5 ? "RC4(40)" : "RC4(56)")
:((alg2&SSL2_CF_8_BYTE_ENC)?"RC4(64)":"RC4(128)");
break;
case SSL_RC2:
enc=is_export?(kl == 5 ? "RC2(40)" : "RC2(56)"):"RC2(128)";
enc=is_export?(kl == 5 ? "RC2(40)" : "RC2(56)"):"RC2(128)";
break;
case SSL_IDEA:
enc="IDEA(128)";