diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-03-29 22:18:54 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-03-29 22:18:54 +0000 |
| commit | bc37a6b81c9a5e295481a1dd9ee572a4bddbf5ec (patch) | |
| tree | 370def1e5b4597f6ac908edb421bfad02b98feea /ssl | |
| parent | ee0508d4114e2b2291953a7d4c81a09b624b8821 (diff) | |
Remove deleted PKCS#12 functions from pkcs12.h, get rid of object creation
kludge, remove CRs from ssl_ciph.c and update Win32 functions for PKCS#12
code. It might compile under Win32 now ...
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_ciph.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 29058d7f15..e3f61ea0bc 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -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)"; |