diff options
| author | miod <> | 2014-04-27 20:26:49 +0000 |
|---|---|---|
| committer | miod <> | 2014-04-27 20:26:49 +0000 |
| commit | 45bb7f0ae87ddf787dd06d515db9afb04a74bf6c (patch) | |
| tree | 319f4236c4f33e8d28d3d3a51c99e82d996e948f /src/lib/libcrypto/cmac | |
| parent | cbbb78bcf8e4dca14564fbea5fdfe0703e2951cc (diff) | |
| download | openbsd-45bb7f0ae87ddf787dd06d515db9afb04a74bf6c.tar.gz openbsd-45bb7f0ae87ddf787dd06d515db9afb04a74bf6c.tar.bz2 openbsd-45bb7f0ae87ddf787dd06d515db9afb04a74bf6c.zip | |
Use C99 initializers for the various FOO_METHOD structs. More readable, and
avoid unreadable/unmaintainable constructs like that:
const EVP_PKEY_ASN1_METHOD cmac_asn1_meth =
{
EVP_PKEY_CMAC,
EVP_PKEY_CMAC,
0,
"CMAC",
"OpenSSL CMAC method",
0,0,0,0,
0,0,0,
cmac_size,
0,
0,0,0,0,0,0,0,
cmac_key_free,
0,
0,0
};
ok matthew@ deraadt@
Diffstat (limited to 'src/lib/libcrypto/cmac')
| -rw-r--r-- | src/lib/libcrypto/cmac/cm_ameth.c | 27 | ||||
| -rw-r--r-- | src/lib/libcrypto/cmac/cm_pmeth.c | 42 |
2 files changed, 20 insertions, 49 deletions
diff --git a/src/lib/libcrypto/cmac/cm_ameth.c b/src/lib/libcrypto/cmac/cm_ameth.c index 0b8e5670b0..c960e1cf43 100644 --- a/src/lib/libcrypto/cmac/cm_ameth.c +++ b/src/lib/libcrypto/cmac/cm_ameth.c | |||
| @@ -73,25 +73,14 @@ static void cmac_key_free(EVP_PKEY *pkey) | |||
| 73 | CMAC_CTX_free(cmctx); | 73 | CMAC_CTX_free(cmctx); |
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | const EVP_PKEY_ASN1_METHOD cmac_asn1_meth = | 76 | const EVP_PKEY_ASN1_METHOD cmac_asn1_meth = { |
| 77 | { | 77 | .pkey_id = EVP_PKEY_CMAC, |
| 78 | EVP_PKEY_CMAC, | 78 | .pkey_base_id = EVP_PKEY_CMAC, |
| 79 | EVP_PKEY_CMAC, | ||
| 80 | 0, | ||
| 81 | |||
| 82 | "CMAC", | ||
| 83 | "OpenSSL CMAC method", | ||
| 84 | |||
| 85 | 0,0,0,0, | ||
| 86 | |||
| 87 | 0,0,0, | ||
| 88 | 79 | ||
| 89 | cmac_size, | 80 | .pem_str = "CMAC", |
| 90 | 0, | 81 | .info = "OpenSSL CMAC method", |
| 91 | 0,0,0,0,0,0,0, | ||
| 92 | 82 | ||
| 93 | cmac_key_free, | 83 | .pkey_size = cmac_size, |
| 94 | 0, | 84 | .pkey_free = cmac_key_free |
| 95 | 0,0 | 85 | }; |
| 96 | }; | ||
| 97 | 86 | ||
diff --git a/src/lib/libcrypto/cmac/cm_pmeth.c b/src/lib/libcrypto/cmac/cm_pmeth.c index 00aa4d64d2..e1a00e90bb 100644 --- a/src/lib/libcrypto/cmac/cm_pmeth.c +++ b/src/lib/libcrypto/cmac/cm_pmeth.c | |||
| @@ -188,37 +188,19 @@ static int pkey_cmac_ctrl_str(EVP_PKEY_CTX *ctx, | |||
| 188 | return -2; | 188 | return -2; |
| 189 | } | 189 | } |
| 190 | 190 | ||
| 191 | const EVP_PKEY_METHOD cmac_pkey_meth = | 191 | const EVP_PKEY_METHOD cmac_pkey_meth = { |
| 192 | { | 192 | .pkey_id = EVP_PKEY_CMAC, |
| 193 | EVP_PKEY_CMAC, | 193 | .flags = EVP_PKEY_FLAG_SIGCTX_CUSTOM, |
| 194 | EVP_PKEY_FLAG_SIGCTX_CUSTOM, | ||
| 195 | pkey_cmac_init, | ||
| 196 | pkey_cmac_copy, | ||
| 197 | pkey_cmac_cleanup, | ||
| 198 | |||
| 199 | 0, 0, | ||
| 200 | |||
| 201 | 0, | ||
| 202 | pkey_cmac_keygen, | ||
| 203 | |||
| 204 | 0, 0, | ||
| 205 | |||
| 206 | 0, 0, | ||
| 207 | |||
| 208 | 0,0, | ||
| 209 | |||
| 210 | cmac_signctx_init, | ||
| 211 | cmac_signctx, | ||
| 212 | |||
| 213 | 0,0, | ||
| 214 | |||
| 215 | 0,0, | ||
| 216 | 194 | ||
| 217 | 0,0, | 195 | .init = pkey_cmac_init, |
| 196 | .copy = pkey_cmac_copy, | ||
| 197 | .cleanup = pkey_cmac_cleanup, | ||
| 218 | 198 | ||
| 219 | 0,0, | 199 | .keygen = pkey_cmac_keygen, |
| 220 | 200 | ||
| 221 | pkey_cmac_ctrl, | 201 | .signctx_init = cmac_signctx_init, |
| 222 | pkey_cmac_ctrl_str | 202 | .signctx = cmac_signctx, |
| 223 | 203 | ||
| 224 | }; | 204 | .ctrl = pkey_cmac_ctrl, |
| 205 | .ctrl_str = pkey_cmac_ctrl_str | ||
| 206 | }; | ||