diff options
| author | markus <> | 2002-09-12 20:53:05 +0000 |
|---|---|---|
| committer | markus <> | 2002-09-12 20:53:05 +0000 |
| commit | 31392c89d1135cf2a416f97295f6d21681b3fbc4 (patch) | |
| tree | 09ce0b27981cae5a4625fa506a24d5c79fc8a13a /src/lib/libcrypto/evp | |
| parent | 715a204e4615e4a70a466fcb383a9a57cad5e6b8 (diff) | |
| download | openbsd-31392c89d1135cf2a416f97295f6d21681b3fbc4.tar.gz openbsd-31392c89d1135cf2a416f97295f6d21681b3fbc4.tar.bz2 openbsd-31392c89d1135cf2a416f97295f6d21681b3fbc4.zip | |
import openssl-0.9.7-stable-SNAP-20020911 (without idea)
Diffstat (limited to 'src/lib/libcrypto/evp')
| -rw-r--r-- | src/lib/libcrypto/evp/evp_locl.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/evp/evp_locl.h b/src/lib/libcrypto/evp/evp_locl.h index 7b088b4848..4d81a3bf4c 100644 --- a/src/lib/libcrypto/evp/evp_locl.h +++ b/src/lib/libcrypto/evp/evp_locl.h | |||
| @@ -124,17 +124,17 @@ const EVP_CIPHER *EVP_##cname##_##mode(void) { return &cname##_##mode; } | |||
| 124 | BLOCK_CIPHER_def1(cname, cbc, cbc, CBC, kstruct, nid, block_size, key_len, \ | 124 | BLOCK_CIPHER_def1(cname, cbc, cbc, CBC, kstruct, nid, block_size, key_len, \ |
| 125 | iv_len, flags, init_key, cleanup, set_asn1, get_asn1, ctrl) | 125 | iv_len, flags, init_key, cleanup, set_asn1, get_asn1, ctrl) |
| 126 | 126 | ||
| 127 | #define BLOCK_CIPHER_def_cfb(cname, kstruct, nid, block_size, key_len, \ | 127 | #define BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len, \ |
| 128 | iv_len, cbits, flags, init_key, cleanup, \ | 128 | iv_len, cbits, flags, init_key, cleanup, \ |
| 129 | set_asn1, get_asn1, ctrl) \ | 129 | set_asn1, get_asn1, ctrl) \ |
| 130 | BLOCK_CIPHER_def1(cname, cfb##cbits, cfb, CFB, kstruct, nid, block_size, \ | 130 | BLOCK_CIPHER_def1(cname, cfb##cbits, cfb, CFB, kstruct, nid, 1, \ |
| 131 | key_len, iv_len, flags, init_key, cleanup, set_asn1, \ | 131 | key_len, iv_len, flags, init_key, cleanup, set_asn1, \ |
| 132 | get_asn1, ctrl) | 132 | get_asn1, ctrl) |
| 133 | 133 | ||
| 134 | #define BLOCK_CIPHER_def_ofb(cname, kstruct, nid, block_size, key_len, \ | 134 | #define BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len, \ |
| 135 | iv_len, cbits, flags, init_key, cleanup, \ | 135 | iv_len, cbits, flags, init_key, cleanup, \ |
| 136 | set_asn1, get_asn1, ctrl) \ | 136 | set_asn1, get_asn1, ctrl) \ |
| 137 | BLOCK_CIPHER_def1(cname, ofb##cbits, ofb, OFB, kstruct, nid, block_size, \ | 137 | BLOCK_CIPHER_def1(cname, ofb##cbits, ofb, OFB, kstruct, nid, 1, \ |
| 138 | key_len, iv_len, flags, init_key, cleanup, set_asn1, \ | 138 | key_len, iv_len, flags, init_key, cleanup, set_asn1, \ |
| 139 | get_asn1, ctrl) | 139 | get_asn1, ctrl) |
| 140 | 140 | ||
| @@ -149,9 +149,9 @@ BLOCK_CIPHER_def1(cname, ecb, ecb, ECB, kstruct, nid, block_size, key_len, \ | |||
| 149 | init_key, cleanup, set_asn1, get_asn1, ctrl) \ | 149 | init_key, cleanup, set_asn1, get_asn1, ctrl) \ |
| 150 | BLOCK_CIPHER_def_cbc(cname, kstruct, nid, block_size, key_len, iv_len, flags, \ | 150 | BLOCK_CIPHER_def_cbc(cname, kstruct, nid, block_size, key_len, iv_len, flags, \ |
| 151 | init_key, cleanup, set_asn1, get_asn1, ctrl) \ | 151 | init_key, cleanup, set_asn1, get_asn1, ctrl) \ |
| 152 | BLOCK_CIPHER_def_cfb(cname, kstruct, nid, block_size, key_len, iv_len, cbits, \ | 152 | BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len, iv_len, cbits, \ |
| 153 | flags, init_key, cleanup, set_asn1, get_asn1, ctrl) \ | 153 | flags, init_key, cleanup, set_asn1, get_asn1, ctrl) \ |
| 154 | BLOCK_CIPHER_def_ofb(cname, kstruct, nid, block_size, key_len, iv_len, cbits, \ | 154 | BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len, iv_len, cbits, \ |
| 155 | flags, init_key, cleanup, set_asn1, get_asn1, ctrl) \ | 155 | flags, init_key, cleanup, set_asn1, get_asn1, ctrl) \ |
| 156 | BLOCK_CIPHER_def_ecb(cname, kstruct, nid, block_size, key_len, iv_len, flags, \ | 156 | BLOCK_CIPHER_def_ecb(cname, kstruct, nid, block_size, key_len, iv_len, flags, \ |
| 157 | init_key, cleanup, set_asn1, get_asn1, ctrl) | 157 | init_key, cleanup, set_asn1, get_asn1, ctrl) |
