| 1 |
diff -up openssl-fips-0.9.8e/crypto/crypto.h.abi openssl-fips-0.9.8e/crypto/crypto.h |
| 2 |
--- openssl-fips-0.9.8e/crypto/crypto.h.abi 2008-09-04 12:38:01.000000000 +0200 |
| 3 |
+++ openssl-fips-0.9.8e/crypto/crypto.h 2008-09-04 13:00:39.000000000 +0200 |
| 4 |
@@ -343,7 +343,18 @@ DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS) |
| 5 |
|
| 6 |
/* Set standard debugging functions (not done by default |
| 7 |
* unless CRYPTO_MDEBUG is defined) */ |
| 8 |
+#ifdef OPENSSL_USE_NEW_FUNCTIONS |
| 9 |
void CRYPTO_malloc_debug_init(void); |
| 10 |
+#else |
| 11 |
+#define CRYPTO_malloc_debug_init() do {\ |
| 12 |
+ CRYPTO_set_mem_debug_functions(\ |
| 13 |
+ CRYPTO_dbg_malloc,\ |
| 14 |
+ CRYPTO_dbg_realloc,\ |
| 15 |
+ CRYPTO_dbg_free,\ |
| 16 |
+ CRYPTO_dbg_set_options,\ |
| 17 |
+ CRYPTO_dbg_get_options);\ |
| 18 |
+ } while(0) |
| 19 |
+#endif |
| 20 |
|
| 21 |
int CRYPTO_mem_ctrl(int mode); |
| 22 |
int CRYPTO_is_mem_check_on(void); |
| 23 |
diff -up openssl-fips-0.9.8e/crypto/rsa/rsa.h.abi openssl-fips-0.9.8e/crypto/rsa/rsa.h |
| 24 |
--- openssl-fips-0.9.8e/crypto/rsa/rsa.h.abi 2008-09-04 12:38:01.000000000 +0200 |
| 25 |
+++ openssl-fips-0.9.8e/crypto/rsa/rsa.h 2008-09-04 12:38:02.000000000 +0200 |
| 26 |
@@ -226,7 +226,6 @@ struct rsa_st |
| 27 |
* operations and results in faster RSA |
| 28 |
* private key operations. |
| 29 |
*/ |
| 30 |
-#ifndef OPENSSL_NO_DEPRECATED |
| 31 |
#define RSA_FLAG_NO_EXP_CONSTTIME RSA_FLAG_NO_CONSTTIME /* deprecated name for the flag*/ |
| 32 |
/* new with 0.9.7h; the built-in RSA |
| 33 |
* implementation now uses constant time |
| 34 |
@@ -235,7 +234,6 @@ struct rsa_st |
| 35 |
* faster variable sliding window method to |
| 36 |
* be used for all exponents. |
| 37 |
*/ |
| 38 |
-#endif |
| 39 |
|
| 40 |
|
| 41 |
#define RSA_PKCS1_PADDING 1 |
| 42 |
diff -up openssl-fips-0.9.8e/crypto/evp/e_des3.c.abi openssl-fips-0.9.8e/crypto/evp/e_des3.c |
| 43 |
--- openssl-fips-0.9.8e/crypto/evp/e_des3.c.abi 2007-07-01 19:58:14.000000000 +0200 |
| 44 |
+++ openssl-fips-0.9.8e/crypto/evp/e_des3.c 2008-09-04 12:38:02.000000000 +0200 |
| 45 |
@@ -87,6 +87,7 @@ typedef struct |
| 46 |
static int des_ede_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, |
| 47 |
const unsigned char *in, unsigned int inl) |
| 48 |
{ |
| 49 |
+ /* FIPS selftest embedded in the loop macro */ |
| 50 |
BLOCK_CIPHER_ecb_loop() |
| 51 |
DES_ecb3_encrypt((const_DES_cblock *)(in + i), |
| 52 |
(DES_cblock *)(out + i), |
| 53 |
@@ -99,6 +100,9 @@ static int des_ede_ecb_cipher(EVP_CIPHER |
| 54 |
static int des_ede_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, |
| 55 |
const unsigned char *in, unsigned int inl) |
| 56 |
{ |
| 57 |
+#ifdef OPENSSL_FIPS |
| 58 |
+ FIPS_selftest_check(); |
| 59 |
+#endif |
| 60 |
DES_ede3_ofb64_encrypt(in, out, (long)inl, |
| 61 |
&data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3, |
| 62 |
(DES_cblock *)ctx->iv, &ctx->num); |
| 63 |
@@ -108,6 +112,9 @@ static int des_ede_ofb_cipher(EVP_CIPHER |
| 64 |
static int des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, |
| 65 |
const unsigned char *in, unsigned int inl) |
| 66 |
{ |
| 67 |
+#ifdef OPENSSL_FIPS |
| 68 |
+ FIPS_selftest_check(); |
| 69 |
+#endif |
| 70 |
#ifdef KSSL_DEBUG |
| 71 |
{ |
| 72 |
int i; |
| 73 |
@@ -128,6 +135,9 @@ static int des_ede_cbc_cipher(EVP_CIPHER |
| 74 |
static int des_ede_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, |
| 75 |
const unsigned char *in, unsigned int inl) |
| 76 |
{ |
| 77 |
+#ifdef OPENSSL_FIPS |
| 78 |
+ FIPS_selftest_check(); |
| 79 |
+#endif |
| 80 |
DES_ede3_cfb64_encrypt(in, out, (long)inl, |
| 81 |
&data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3, |
| 82 |
(DES_cblock *)ctx->iv, &ctx->num, ctx->encrypt); |
| 83 |
@@ -142,6 +152,9 @@ static int des_ede3_cfb1_cipher(EVP_CIPH |
| 84 |
unsigned int n; |
| 85 |
unsigned char c[1],d[1]; |
| 86 |
|
| 87 |
+#ifdef OPENSSL_FIPS |
| 88 |
+ FIPS_selftest_check(); |
| 89 |
+#endif |
| 90 |
for(n=0 ; n < inl ; ++n) |
| 91 |
{ |
| 92 |
c[0]=(in[n/8]&(1 << (7-n%8))) ? 0x80 : 0; |
| 93 |
@@ -157,6 +170,9 @@ static int des_ede3_cfb1_cipher(EVP_CIPH |
| 94 |
static int des_ede3_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, |
| 95 |
const unsigned char *in, unsigned int inl) |
| 96 |
{ |
| 97 |
+#ifdef OPENSSL_FIPS |
| 98 |
+ FIPS_selftest_check(); |
| 99 |
+#endif |
| 100 |
DES_ede3_cfb_encrypt(in,out,8,inl, |
| 101 |
&data(ctx)->ks1,&data(ctx)->ks2,&data(ctx)->ks3, |
| 102 |
(DES_cblock *)ctx->iv,ctx->encrypt); |
| 103 |
diff -up openssl-fips-0.9.8e/crypto/evp/evp_locl.h.abi openssl-fips-0.9.8e/crypto/evp/evp_locl.h |
| 104 |
--- openssl-fips-0.9.8e/crypto/evp/evp_locl.h.abi 2008-09-04 12:38:02.000000000 +0200 |
| 105 |
+++ openssl-fips-0.9.8e/crypto/evp/evp_locl.h 2008-09-04 12:38:02.000000000 +0200 |
| 106 |
@@ -60,8 +60,10 @@ |
| 107 |
|
| 108 |
/* Wrapper functions for each cipher mode */ |
| 109 |
|
| 110 |
+#ifdef OPENSSL_FIPS |
| 111 |
#define BLOCK_CIPHER_ecb_loop() \ |
| 112 |
unsigned int i, bl; \ |
| 113 |
+ FIPS_selftest_check(); \ |
| 114 |
bl = ctx->cipher->block_size;\ |
| 115 |
if(inl < bl) return 1;\ |
| 116 |
inl -= bl; \ |
| 117 |
@@ -78,6 +80,7 @@ static int cname##_ecb_cipher(EVP_CIPHER |
| 118 |
#define BLOCK_CIPHER_func_ofb(cname, cprefix, cbits, kstruct, ksched) \ |
| 119 |
static int cname##_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl) \ |
| 120 |
{\ |
| 121 |
+ FIPS_selftest_check(); \ |
| 122 |
cprefix##_ofb##cbits##_encrypt(in, out, (long)inl, &((kstruct *)ctx->cipher_data)->ksched, ctx->iv, &ctx->num);\ |
| 123 |
return 1;\ |
| 124 |
} |
| 125 |
@@ -85,6 +88,7 @@ static int cname##_ofb_cipher(EVP_CIPHER |
| 126 |
#define BLOCK_CIPHER_func_cbc(cname, cprefix, kstruct, ksched) \ |
| 127 |
static int cname##_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl) \ |
| 128 |
{\ |
| 129 |
+ FIPS_selftest_check(); \ |
| 130 |
cprefix##_cbc_encrypt(in, out, (long)inl, &((kstruct *)ctx->cipher_data)->ksched, ctx->iv, ctx->encrypt);\ |
| 131 |
return 1;\ |
| 132 |
} |
| 133 |
@@ -92,9 +96,47 @@ static int cname##_cbc_cipher(EVP_CIPHER |
| 134 |
#define BLOCK_CIPHER_func_cfb(cname, cprefix, cbits, kstruct, ksched) \ |
| 135 |
static int cname##_cfb##cbits##_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl) \ |
| 136 |
{\ |
| 137 |
+ FIPS_selftest_check(); \ |
| 138 |
cprefix##_cfb##cbits##_encrypt(in, out, (long)((cbits==1) && !(ctx->flags & EVP_CIPH_FLAG_LENGTH_BITS) ?inl*8:inl), &((kstruct *)ctx->cipher_data)->ksched, ctx->iv, &ctx->num, ctx->encrypt);\ |
| 139 |
return 1;\ |
| 140 |
} |
| 141 |
+#else |
| 142 |
+#define BLOCK_CIPHER_ecb_loop() \ |
| 143 |
+ unsigned int i, bl; \ |
| 144 |
+ bl = ctx->cipher->block_size;\ |
| 145 |
+ if(inl < bl) return 1;\ |
| 146 |
+ inl -= bl; \ |
| 147 |
+ for(i=0; i <= inl; i+=bl) |
| 148 |
+ |
| 149 |
+#define BLOCK_CIPHER_func_ecb(cname, cprefix, kstruct, ksched) \ |
| 150 |
+static int cname##_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl) \ |
| 151 |
+{\ |
| 152 |
+ BLOCK_CIPHER_ecb_loop() \ |
| 153 |
+ cprefix##_ecb_encrypt(in + i, out + i, &((kstruct *)ctx->cipher_data)->ksched, ctx->encrypt);\ |
| 154 |
+ return 1;\ |
| 155 |
+} |
| 156 |
+ |
| 157 |
+#define BLOCK_CIPHER_func_ofb(cname, cprefix, cbits, kstruct, ksched) \ |
| 158 |
+static int cname##_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl) \ |
| 159 |
+{\ |
| 160 |
+ cprefix##_ofb##cbits##_encrypt(in, out, (long)inl, &((kstruct *)ctx->cipher_data)->ksched, ctx->iv, &ctx->num);\ |
| 161 |
+ return 1;\ |
| 162 |
+} |
| 163 |
+ |
| 164 |
+#define BLOCK_CIPHER_func_cbc(cname, cprefix, kstruct, ksched) \ |
| 165 |
+static int cname##_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl) \ |
| 166 |
+{\ |
| 167 |
+ cprefix##_cbc_encrypt(in, out, (long)inl, &((kstruct *)ctx->cipher_data)->ksched, ctx->iv, ctx->encrypt);\ |
| 168 |
+ return 1;\ |
| 169 |
+} |
| 170 |
+ |
| 171 |
+#define BLOCK_CIPHER_func_cfb(cname, cprefix, cbits, kstruct, ksched) \ |
| 172 |
+static int cname##_cfb##cbits##_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl) \ |
| 173 |
+{\ |
| 174 |
+ cprefix##_cfb##cbits##_encrypt(in, out, (long)((cbits==1) && !(ctx->flags & EVP_CIPH_FLAG_LENGTH_BITS) ?inl*8:inl), &((kstruct *)ctx->cipher_data)->ksched, ctx->iv, &ctx->num, ctx->encrypt);\ |
| 175 |
+ return 1;\ |
| 176 |
+} |
| 177 |
+#endif |
| 178 |
|
| 179 |
#define BLOCK_CIPHER_all_funcs(cname, cprefix, cbits, kstruct, ksched) \ |
| 180 |
BLOCK_CIPHER_func_cbc(cname, cprefix, kstruct, ksched) \ |
| 181 |
diff -up openssl-fips-0.9.8e/crypto/evp/enc_min.c.abi openssl-fips-0.9.8e/crypto/evp/enc_min.c |
| 182 |
--- openssl-fips-0.9.8e/crypto/evp/enc_min.c.abi 2007-08-19 14:49:07.000000000 +0200 |
| 183 |
+++ openssl-fips-0.9.8e/crypto/evp/enc_min.c 2008-09-04 12:38:02.000000000 +0200 |
| 184 |
@@ -347,9 +347,6 @@ int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CT |
| 185 |
|
| 186 |
int EVP_Cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl) |
| 187 |
{ |
| 188 |
-#ifdef OPENSSL_FIPS |
| 189 |
- FIPS_selftest_check(); |
| 190 |
-#endif |
| 191 |
return ctx->cipher->do_cipher(ctx,out,in,inl); |
| 192 |
} |
| 193 |
|
| 194 |
diff -up openssl-fips-0.9.8e/crypto/evp/evp.h.abi openssl-fips-0.9.8e/crypto/evp/evp.h |
| 195 |
--- openssl-fips-0.9.8e/crypto/evp/evp.h.abi 2008-09-04 12:38:02.000000000 +0200 |
| 196 |
+++ openssl-fips-0.9.8e/crypto/evp/evp.h 2008-09-04 13:00:16.000000000 +0200 |
| 197 |
@@ -448,6 +448,7 @@ typedef int (EVP_PBE_KEYGEN)(EVP_CIPHER_ |
| 198 |
#define EVP_get_cipherbynid(a) EVP_get_cipherbyname(OBJ_nid2sn(a)) |
| 199 |
#define EVP_get_cipherbyobj(a) EVP_get_cipherbynid(OBJ_obj2nid(a)) |
| 200 |
|
| 201 |
+#ifdef OPENSSL_USE_NEW_FUNCTIONS |
| 202 |
/* Macros to reduce FIPS dependencies: do NOT use in applications */ |
| 203 |
#define M_EVP_MD_size(e) ((e)->md_size) |
| 204 |
#define M_EVP_MD_block_size(e) ((e)->block_size) |
| 205 |
@@ -490,6 +491,38 @@ void EVP_CIPHER_CTX_set_app_data(EVP_CIP |
| 206 |
#define EVP_CIPHER_CTX_type(c) EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c)) |
| 207 |
unsigned long EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx); |
| 208 |
#define EVP_CIPHER_CTX_mode(e) (EVP_CIPHER_CTX_flags(e) & EVP_CIPH_MODE) |
| 209 |
+#else |
| 210 |
+#define EVP_MD_type(e) ((e)->type) |
| 211 |
+#define EVP_MD_nid(e) EVP_MD_type(e) |
| 212 |
+#define EVP_MD_name(e) OBJ_nid2sn(EVP_MD_nid(e)) |
| 213 |
+#define EVP_MD_pkey_type(e) ((e)->pkey_type) |
| 214 |
+#define EVP_MD_size(e) ((e)->md_size) |
| 215 |
+#define EVP_MD_block_size(e) ((e)->block_size) |
| 216 |
+ |
| 217 |
+#define EVP_MD_CTX_md(e) ((e)->digest) |
| 218 |
+#define EVP_MD_CTX_size(e) EVP_MD_size((e)->digest) |
| 219 |
+#define EVP_MD_CTX_block_size(e) EVP_MD_block_size((e)->digest) |
| 220 |
+#define EVP_MD_CTX_type(e) EVP_MD_type((e)->digest) |
| 221 |
+ |
| 222 |
+#define EVP_CIPHER_nid(e) ((e)->nid) |
| 223 |
+#define EVP_CIPHER_name(e) OBJ_nid2sn(EVP_CIPHER_nid(e)) |
| 224 |
+#define EVP_CIPHER_block_size(e) ((e)->block_size) |
| 225 |
+#define EVP_CIPHER_key_length(e) ((e)->key_len) |
| 226 |
+#define EVP_CIPHER_iv_length(e) ((e)->iv_len) |
| 227 |
+#define EVP_CIPHER_flags(e) ((e)->flags) |
| 228 |
+#define EVP_CIPHER_mode(e) (((e)->flags) & EVP_CIPH_MODE) |
| 229 |
+ |
| 230 |
+#define EVP_CIPHER_CTX_cipher(e) ((e)->cipher) |
| 231 |
+#define EVP_CIPHER_CTX_nid(e) ((e)->cipher->nid) |
| 232 |
+#define EVP_CIPHER_CTX_block_size(e) ((e)->cipher->block_size) |
| 233 |
+#define EVP_CIPHER_CTX_key_length(e) ((e)->key_len) |
| 234 |
+#define EVP_CIPHER_CTX_iv_length(e) ((e)->cipher->iv_len) |
| 235 |
+#define EVP_CIPHER_CTX_get_app_data(e) ((e)->app_data) |
| 236 |
+#define EVP_CIPHER_CTX_set_app_data(e,d) ((e)->app_data=(char *)(d)) |
| 237 |
+#define EVP_CIPHER_CTX_type(c) EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c)) |
| 238 |
+#define EVP_CIPHER_CTX_flags(e) ((e)->cipher->flags) |
| 239 |
+#define EVP_CIPHER_CTX_mode(e) ((e)->cipher->flags & EVP_CIPH_MODE) |
| 240 |
+#endif |
| 241 |
|
| 242 |
#define EVP_ENCODE_LENGTH(l) (((l+2)/3*4)+(l/48+1)*2+80) |
| 243 |
#define EVP_DECODE_LENGTH(l) ((l+3)/4*3+80) |
| 244 |
@@ -514,10 +547,14 @@ void BIO_set_md(BIO *,const EVP_MD *md); |
| 245 |
#define BIO_get_cipher_status(b) BIO_ctrl(b,BIO_C_GET_CIPHER_STATUS,0,NULL) |
| 246 |
#define BIO_get_cipher_ctx(b,c_pp) BIO_ctrl(b,BIO_C_GET_CIPHER_CTX,0,(char *)c_pp) |
| 247 |
|
| 248 |
+#ifdef OPENSSL_USE_NEW_FUNCTIONS |
| 249 |
int EVP_Cipher(EVP_CIPHER_CTX *c, |
| 250 |
unsigned char *out, |
| 251 |
const unsigned char *in, |
| 252 |
unsigned int inl); |
| 253 |
+#else |
| 254 |
+#define EVP_Cipher(c,o,i,l) (c)->cipher->do_cipher((c),(o),(i),(l)) |
| 255 |
+#endif |
| 256 |
|
| 257 |
#define EVP_add_cipher_alias(n,alias) \ |
| 258 |
OBJ_NAME_add((alias),OBJ_NAME_TYPE_CIPHER_METH|OBJ_NAME_ALIAS,(n)) |
| 259 |
@@ -533,9 +570,15 @@ int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx); |
| 260 |
EVP_MD_CTX *EVP_MD_CTX_create(void); |
| 261 |
void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx); |
| 262 |
int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out,const EVP_MD_CTX *in); |
| 263 |
+#ifdef OPENSSL_USE_NEW_FUNCTIONS |
| 264 |
void EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags); |
| 265 |
void EVP_MD_CTX_clear_flags(EVP_MD_CTX *ctx, int flags); |
| 266 |
int EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx,int flags); |
| 267 |
+#else |
| 268 |
+#define EVP_MD_CTX_set_flags(ctx,flgs) ((ctx)->flags|=(flgs)) |
| 269 |
+#define EVP_MD_CTX_clear_flags(ctx,flgs) ((ctx)->flags&=~(flgs)) |
| 270 |
+#define EVP_MD_CTX_test_flags(ctx,flgs) ((ctx)->flags&(flgs)) |
| 271 |
+#endif |
| 272 |
int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl); |
| 273 |
int EVP_DigestUpdate(EVP_MD_CTX *ctx,const void *d, |
| 274 |
size_t cnt); |
| 275 |
diff -up openssl-fips-0.9.8e/crypto/bio/bio.h.abi openssl-fips-0.9.8e/crypto/bio/bio.h |
| 276 |
--- openssl-fips-0.9.8e/crypto/bio/bio.h.abi 2008-09-04 12:38:02.000000000 +0200 |
| 277 |
+++ openssl-fips-0.9.8e/crypto/bio/bio.h 2008-09-04 13:00:32.000000000 +0200 |
| 278 |
@@ -198,6 +198,7 @@ extern "C" { |
| 279 |
|
| 280 |
typedef struct bio_st BIO; |
| 281 |
|
| 282 |
+#ifdef OPENSSL_USE_NEW_FUNCTIONS |
| 283 |
void BIO_set_flags(BIO *b, int flags); |
| 284 |
int BIO_test_flags(const BIO *b, int flags); |
| 285 |
void BIO_clear_flags(BIO *b, int flags); |
| 286 |
@@ -222,6 +223,30 @@ void BIO_clear_flags(BIO *b, int flags); |
| 287 |
#define BIO_should_io_special(a) BIO_test_flags(a, BIO_FLAGS_IO_SPECIAL) |
| 288 |
#define BIO_retry_type(a) BIO_test_flags(a, BIO_FLAGS_RWS) |
| 289 |
#define BIO_should_retry(a) BIO_test_flags(a, BIO_FLAGS_SHOULD_RETRY) |
| 290 |
+#else |
| 291 |
+#define BIO_set_flags(b,f) ((b)->flags|=(f)) |
| 292 |
+#define BIO_get_flags(b) ((b)->flags) |
| 293 |
+#define BIO_set_retry_special(b) \ |
| 294 |
+ ((b)->flags|=(BIO_FLAGS_IO_SPECIAL|BIO_FLAGS_SHOULD_RETRY)) |
| 295 |
+#define BIO_set_retry_read(b) \ |
| 296 |
+ ((b)->flags|=(BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY)) |
| 297 |
+#define BIO_set_retry_write(b) \ |
| 298 |
+ ((b)->flags|=(BIO_FLAGS_WRITE|BIO_FLAGS_SHOULD_RETRY)) |
| 299 |
+ |
| 300 |
+/* These are normally used internally in BIOs */ |
| 301 |
+#define BIO_clear_flags(b,f) ((b)->flags&= ~(f)) |
| 302 |
+#define BIO_clear_retry_flags(b) \ |
| 303 |
+ ((b)->flags&= ~(BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY)) |
| 304 |
+#define BIO_get_retry_flags(b) \ |
| 305 |
+ ((b)->flags&(BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY)) |
| 306 |
+ |
| 307 |
+/* These should be used by the application to tell why we should retry */ |
| 308 |
+#define BIO_should_read(a) ((a)->flags & BIO_FLAGS_READ) |
| 309 |
+#define BIO_should_write(a) ((a)->flags & BIO_FLAGS_WRITE) |
| 310 |
+#define BIO_should_io_special(a) ((a)->flags & BIO_FLAGS_IO_SPECIAL) |
| 311 |
+#define BIO_retry_type(a) ((a)->flags & BIO_FLAGS_RWS) |
| 312 |
+#define BIO_should_retry(a) ((a)->flags & BIO_FLAGS_SHOULD_RETRY) |
| 313 |
+#endif |
| 314 |
|
| 315 |
/* The next three are used in conjunction with the |
| 316 |
* BIO_should_io_special() condition. After this returns true, |
| 317 |
@@ -250,6 +275,7 @@ void BIO_clear_flags(BIO *b, int flags); |
| 318 |
#define BIO_cb_pre(a) (!((a)&BIO_CB_RETURN)) |
| 319 |
#define BIO_cb_post(a) ((a)&BIO_CB_RETURN) |
| 320 |
|
| 321 |
+#ifdef OPENSSL_USE_NEW_FUNCTIONS |
| 322 |
long (*BIO_get_callback(const BIO *b)) (struct bio_st *,int,const char *,int, long,long); |
| 323 |
void BIO_set_callback(BIO *b, |
| 324 |
long (*callback)(struct bio_st *,int,const char *,int, long,long)); |
| 325 |
@@ -258,6 +284,14 @@ void BIO_set_callback_arg(BIO *b, char * |
| 326 |
|
| 327 |
const char * BIO_method_name(const BIO *b); |
| 328 |
int BIO_method_type(const BIO *b); |
| 329 |
+#else |
| 330 |
+#define BIO_set_callback(b,cb) ((b)->callback=(cb)) |
| 331 |
+#define BIO_set_callback_arg(b,arg) ((b)->cb_arg=(char *)(arg)) |
| 332 |
+#define BIO_get_callback_arg(b) ((b)->cb_arg) |
| 333 |
+#define BIO_get_callback(b) ((b)->callback) |
| 334 |
+#define BIO_method_name(b) ((b)->method->name) |
| 335 |
+#define BIO_method_type(b) ((b)->method->type) |
| 336 |
+#endif |
| 337 |
|
| 338 |
typedef void bio_info_cb(struct bio_st *, int, const char *, int, long, long); |
| 339 |
|
| 340 |
diff -up openssl-fips-0.9.8e/crypto/bn/bn.h.abi openssl-fips-0.9.8e/crypto/bn/bn.h |
| 341 |
--- openssl-fips-0.9.8e/crypto/bn/bn.h.abi 2008-09-04 12:38:02.000000000 +0200 |
| 342 |
+++ openssl-fips-0.9.8e/crypto/bn/bn.h 2008-09-04 12:38:02.000000000 +0200 |
| 343 |
@@ -251,11 +251,9 @@ extern "C" { |
| 344 |
* BN_mod_inverse() will call BN_mod_inverse_no_branch. |
| 345 |
*/ |
| 346 |
|
| 347 |
-#ifndef OPENSSL_NO_DEPRECATED |
| 348 |
#define BN_FLG_EXP_CONSTTIME BN_FLG_CONSTTIME /* deprecated name for the flag */ |
| 349 |
/* avoid leaking exponent information through timings |
| 350 |
* (BN_mod_exp_mont() will call BN_mod_exp_mont_consttime) */ |
| 351 |
-#endif |
| 352 |
|
| 353 |
#ifndef OPENSSL_NO_DEPRECATED |
| 354 |
#define BN_FLG_FREE 0x8000 /* used for debuging */ |
| 355 |
diff -up openssl-fips-0.9.8e/crypto/opensslv.h.abi openssl-fips-0.9.8e/crypto/opensslv.h |
| 356 |
--- openssl-fips-0.9.8e/crypto/opensslv.h.abi 2008-09-04 12:38:01.000000000 +0200 |
| 357 |
+++ openssl-fips-0.9.8e/crypto/opensslv.h 2008-09-04 12:38:02.000000000 +0200 |
| 358 |
@@ -25,11 +25,11 @@ |
| 359 |
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for |
| 360 |
* major minor fix final patch/beta) |
| 361 |
*/ |
| 362 |
-#define OPENSSL_VERSION_NUMBER 0x00908060L |
| 363 |
+#define OPENSSL_VERSION_NUMBER 0x0090802fL |
| 364 |
#ifdef OPENSSL_FIPS |
| 365 |
-#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8f-fips-dev xx XXXX xxxx" |
| 366 |
+#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8e-fips-rhel5 01 Jul 2008" |
| 367 |
#else |
| 368 |
-#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8f-dev xx XXXX xxxx" |
| 369 |
+#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8e-rhel5 01 Jul 2008" |
| 370 |
#endif |
| 371 |
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT |
| 372 |
|
| 373 |
diff -up openssl-fips-0.9.8e/ssl/ssl.h.abi openssl-fips-0.9.8e/ssl/ssl.h |
| 374 |
--- openssl-fips-0.9.8e/ssl/ssl.h.abi 2008-09-04 12:38:02.000000000 +0200 |
| 375 |
+++ openssl-fips-0.9.8e/ssl/ssl.h 2008-09-04 13:02:38.000000000 +0200 |
| 376 |
@@ -789,6 +789,7 @@ struct ssl_ctx_st |
| 377 |
#define SSL_CTX_sess_cache_full(ctx) \ |
| 378 |
SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CACHE_FULL,0,NULL) |
| 379 |
|
| 380 |
+#ifdef OPENSSL_USE_NEW_FUNCTIONS |
| 381 |
void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx, int (*new_session_cb)(struct ssl_st *ssl,SSL_SESSION *sess)); |
| 382 |
int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx))(struct ssl_st *ssl, SSL_SESSION *sess); |
| 383 |
void SSL_CTX_sess_set_remove_cb(SSL_CTX *ctx, void (*remove_session_cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess)); |
| 384 |
@@ -801,6 +802,20 @@ void SSL_CTX_set_client_cert_cb(SSL_CTX |
| 385 |
int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL *ssl, X509 **x509, EVP_PKEY **pkey); |
| 386 |
void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx, int (*app_gen_cookie_cb)(SSL *ssl, unsigned char *cookie, unsigned int *cookie_len)); |
| 387 |
void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx, int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie, unsigned int cookie_len)); |
| 388 |
+#else |
| 389 |
+#define SSL_CTX_sess_set_new_cb(ctx,cb) ((ctx)->new_session_cb=(cb)) |
| 390 |
+#define SSL_CTX_sess_get_new_cb(ctx) ((ctx)->new_session_cb) |
| 391 |
+#define SSL_CTX_sess_set_remove_cb(ctx,cb) ((ctx)->remove_session_cb=(cb)) |
| 392 |
+#define SSL_CTX_sess_get_remove_cb(ctx) ((ctx)->remove_session_cb) |
| 393 |
+#define SSL_CTX_sess_set_get_cb(ctx,cb) ((ctx)->get_session_cb=(cb)) |
| 394 |
+#define SSL_CTX_sess_get_get_cb(ctx) ((ctx)->get_session_cb) |
| 395 |
+#define SSL_CTX_set_info_callback(ctx,cb) ((ctx)->info_callback=(cb)) |
| 396 |
+#define SSL_CTX_get_info_callback(ctx) ((ctx)->info_callback) |
| 397 |
+#define SSL_CTX_set_client_cert_cb(ctx,cb) ((ctx)->client_cert_cb=(cb)) |
| 398 |
+#define SSL_CTX_get_client_cert_cb(ctx) ((ctx)->client_cert_cb) |
| 399 |
+#define SSL_CTX_set_cookie_generate_cb(ctx,cb) ((ctx)->app_gen_cookie_cb=(cb)) |
| 400 |
+#define SSL_CTX_set_cookie_verify_cb(ctx,cb) ((ctx)->app_verify_cookie_cb=(cb)) |
| 401 |
+#endif |
| 402 |
|
| 403 |
#define SSL_NOTHING 1 |
| 404 |
#define SSL_WRITING 2 |
Parent Directory
| 
Revision Log
| 
Revision Graph
