tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
crypto: safexcel - Remove cfb and ofb
Remove the unused CFB/OFB implementation.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-160
-4
drivers/crypto/inside-secure/safexcel.c
-4
drivers/crypto/inside-secure/safexcel.c
···
1191
1191
&safexcel_alg_cbc_des3_ede,
1192
1192
&safexcel_alg_ecb_aes,
1193
1193
&safexcel_alg_cbc_aes,
1194
-
&safexcel_alg_cfb_aes,
1195
-
&safexcel_alg_ofb_aes,
1196
1194
&safexcel_alg_ctr_aes,
1197
1195
&safexcel_alg_md5,
1198
1196
&safexcel_alg_sha1,
···
1229
1231
&safexcel_alg_hmac_sm3,
1230
1232
&safexcel_alg_ecb_sm4,
1231
1233
&safexcel_alg_cbc_sm4,
1232
-
&safexcel_alg_ofb_sm4,
1233
-
&safexcel_alg_cfb_sm4,
1234
1234
&safexcel_alg_ctr_sm4,
1235
1235
&safexcel_alg_authenc_hmac_sha1_cbc_sm4,
1236
1236
&safexcel_alg_authenc_hmac_sm3_cbc_sm4,
-4
drivers/crypto/inside-secure/safexcel.h
-4
drivers/crypto/inside-secure/safexcel.h
···
933
933
extern struct safexcel_alg_template safexcel_alg_cbc_des3_ede;
934
934
extern struct safexcel_alg_template safexcel_alg_ecb_aes;
935
935
extern struct safexcel_alg_template safexcel_alg_cbc_aes;
936
-
extern struct safexcel_alg_template safexcel_alg_cfb_aes;
937
-
extern struct safexcel_alg_template safexcel_alg_ofb_aes;
938
936
extern struct safexcel_alg_template safexcel_alg_ctr_aes;
939
937
extern struct safexcel_alg_template safexcel_alg_md5;
940
938
extern struct safexcel_alg_template safexcel_alg_sha1;
···
971
973
extern struct safexcel_alg_template safexcel_alg_hmac_sm3;
972
974
extern struct safexcel_alg_template safexcel_alg_ecb_sm4;
973
975
extern struct safexcel_alg_template safexcel_alg_cbc_sm4;
974
-
extern struct safexcel_alg_template safexcel_alg_ofb_sm4;
975
-
extern struct safexcel_alg_template safexcel_alg_cfb_sm4;
976
976
extern struct safexcel_alg_template safexcel_alg_ctr_sm4;
977
977
extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha1_cbc_sm4;
978
978
extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sm3_cbc_sm4;
-152
drivers/crypto/inside-secure/safexcel_cipher.c
-152
drivers/crypto/inside-secure/safexcel_cipher.c
···
1352
1352
},
1353
1353
};
1354
1354
1355
-
static int safexcel_skcipher_aes_cfb_cra_init(struct crypto_tfm *tfm)
1356
-
{
1357
-
struct safexcel_cipher_ctx *ctx = crypto_tfm_ctx(tfm);
1358
-
1359
-
safexcel_skcipher_cra_init(tfm);
1360
-
ctx->alg = SAFEXCEL_AES;
1361
-
ctx->blocksz = AES_BLOCK_SIZE;
1362
-
ctx->mode = CONTEXT_CONTROL_CRYPTO_MODE_CFB;
1363
-
return 0;
1364
-
}
1365
-
1366
-
struct safexcel_alg_template safexcel_alg_cfb_aes = {
1367
-
.type = SAFEXCEL_ALG_TYPE_SKCIPHER,
1368
-
.algo_mask = SAFEXCEL_ALG_AES | SAFEXCEL_ALG_AES_XFB,
1369
-
.alg.skcipher = {
1370
-
.setkey = safexcel_skcipher_aes_setkey,
1371
-
.encrypt = safexcel_encrypt,
1372
-
.decrypt = safexcel_decrypt,
1373
-
.min_keysize = AES_MIN_KEY_SIZE,
1374
-
.max_keysize = AES_MAX_KEY_SIZE,
1375
-
.ivsize = AES_BLOCK_SIZE,
1376
-
.base = {
1377
-
.cra_name = "cfb(aes)",
1378
-
.cra_driver_name = "safexcel-cfb-aes",
1379
-
.cra_priority = SAFEXCEL_CRA_PRIORITY,
1380
-
.cra_flags = CRYPTO_ALG_ASYNC |
1381
-
CRYPTO_ALG_ALLOCATES_MEMORY |
1382
-
CRYPTO_ALG_KERN_DRIVER_ONLY,
1383
-
.cra_blocksize = 1,
1384
-
.cra_ctxsize = sizeof(struct safexcel_cipher_ctx),
1385
-
.cra_alignmask = 0,
1386
-
.cra_init = safexcel_skcipher_aes_cfb_cra_init,
1387
-
.cra_exit = safexcel_skcipher_cra_exit,
1388
-
.cra_module = THIS_MODULE,
1389
-
},
1390
-
},
1391
-
};
1392
-
1393
-
static int safexcel_skcipher_aes_ofb_cra_init(struct crypto_tfm *tfm)
1394
-
{
1395
-
struct safexcel_cipher_ctx *ctx = crypto_tfm_ctx(tfm);
1396
-
1397
-
safexcel_skcipher_cra_init(tfm);
1398
-
ctx->alg = SAFEXCEL_AES;
1399
-
ctx->blocksz = AES_BLOCK_SIZE;
1400
-
ctx->mode = CONTEXT_CONTROL_CRYPTO_MODE_OFB;
1401
-
return 0;
1402
-
}
1403
-
1404
-
struct safexcel_alg_template safexcel_alg_ofb_aes = {
1405
-
.type = SAFEXCEL_ALG_TYPE_SKCIPHER,
1406
-
.algo_mask = SAFEXCEL_ALG_AES | SAFEXCEL_ALG_AES_XFB,
1407
-
.alg.skcipher = {
1408
-
.setkey = safexcel_skcipher_aes_setkey,
1409
-
.encrypt = safexcel_encrypt,
1410
-
.decrypt = safexcel_decrypt,
1411
-
.min_keysize = AES_MIN_KEY_SIZE,
1412
-
.max_keysize = AES_MAX_KEY_SIZE,
1413
-
.ivsize = AES_BLOCK_SIZE,
1414
-
.base = {
1415
-
.cra_name = "ofb(aes)",
1416
-
.cra_driver_name = "safexcel-ofb-aes",
1417
-
.cra_priority = SAFEXCEL_CRA_PRIORITY,
1418
-
.cra_flags = CRYPTO_ALG_ASYNC |
1419
-
CRYPTO_ALG_ALLOCATES_MEMORY |
1420
-
CRYPTO_ALG_KERN_DRIVER_ONLY,
1421
-
.cra_blocksize = 1,
1422
-
.cra_ctxsize = sizeof(struct safexcel_cipher_ctx),
1423
-
.cra_alignmask = 0,
1424
-
.cra_init = safexcel_skcipher_aes_ofb_cra_init,
1425
-
.cra_exit = safexcel_skcipher_cra_exit,
1426
-
.cra_module = THIS_MODULE,
1427
-
},
1428
-
},
1429
-
};
1430
-
1431
1355
static int safexcel_skcipher_aesctr_setkey(struct crypto_skcipher *ctfm,
1432
1356
const u8 *key, unsigned int len)
1433
1357
{
···
3104
3180
.cra_ctxsize = sizeof(struct safexcel_cipher_ctx),
3105
3181
.cra_alignmask = 0,
3106
3182
.cra_init = safexcel_skcipher_sm4_cbc_cra_init,
3107
-
.cra_exit = safexcel_skcipher_cra_exit,
3108
-
.cra_module = THIS_MODULE,
3109
-
},
3110
-
},
3111
-
};
3112
-
3113
-
static int safexcel_skcipher_sm4_ofb_cra_init(struct crypto_tfm *tfm)
3114
-
{
3115
-
struct safexcel_cipher_ctx *ctx = crypto_tfm_ctx(tfm);
3116
-
3117
-
safexcel_skcipher_cra_init(tfm);
3118
-
ctx->alg = SAFEXCEL_SM4;
3119
-
ctx->blocksz = SM4_BLOCK_SIZE;
3120
-
ctx->mode = CONTEXT_CONTROL_CRYPTO_MODE_OFB;
3121
-
return 0;
3122
-
}
3123
-
3124
-
struct safexcel_alg_template safexcel_alg_ofb_sm4 = {
3125
-
.type = SAFEXCEL_ALG_TYPE_SKCIPHER,
3126
-
.algo_mask = SAFEXCEL_ALG_SM4 | SAFEXCEL_ALG_AES_XFB,
3127
-
.alg.skcipher = {
3128
-
.setkey = safexcel_skcipher_sm4_setkey,
3129
-
.encrypt = safexcel_encrypt,
3130
-
.decrypt = safexcel_decrypt,
3131
-
.min_keysize = SM4_KEY_SIZE,
3132
-
.max_keysize = SM4_KEY_SIZE,
3133
-
.ivsize = SM4_BLOCK_SIZE,
3134
-
.base = {
3135
-
.cra_name = "ofb(sm4)",
3136
-
.cra_driver_name = "safexcel-ofb-sm4",
3137
-
.cra_priority = SAFEXCEL_CRA_PRIORITY,
3138
-
.cra_flags = CRYPTO_ALG_ASYNC |
3139
-
CRYPTO_ALG_ALLOCATES_MEMORY |
3140
-
CRYPTO_ALG_KERN_DRIVER_ONLY,
3141
-
.cra_blocksize = 1,
3142
-
.cra_ctxsize = sizeof(struct safexcel_cipher_ctx),
3143
-
.cra_alignmask = 0,
3144
-
.cra_init = safexcel_skcipher_sm4_ofb_cra_init,
3145
-
.cra_exit = safexcel_skcipher_cra_exit,
3146
-
.cra_module = THIS_MODULE,
3147
-
},
3148
-
},
3149
-
};
3150
-
3151
-
static int safexcel_skcipher_sm4_cfb_cra_init(struct crypto_tfm *tfm)
3152
-
{
3153
-
struct safexcel_cipher_ctx *ctx = crypto_tfm_ctx(tfm);
3154
-
3155
-
safexcel_skcipher_cra_init(tfm);
3156
-
ctx->alg = SAFEXCEL_SM4;
3157
-
ctx->blocksz = SM4_BLOCK_SIZE;
3158
-
ctx->mode = CONTEXT_CONTROL_CRYPTO_MODE_CFB;
3159
-
return 0;
3160
-
}
3161
-
3162
-
struct safexcel_alg_template safexcel_alg_cfb_sm4 = {
3163
-
.type = SAFEXCEL_ALG_TYPE_SKCIPHER,
3164
-
.algo_mask = SAFEXCEL_ALG_SM4 | SAFEXCEL_ALG_AES_XFB,
3165
-
.alg.skcipher = {
3166
-
.setkey = safexcel_skcipher_sm4_setkey,
3167
-
.encrypt = safexcel_encrypt,
3168
-
.decrypt = safexcel_decrypt,
3169
-
.min_keysize = SM4_KEY_SIZE,
3170
-
.max_keysize = SM4_KEY_SIZE,
3171
-
.ivsize = SM4_BLOCK_SIZE,
3172
-
.base = {
3173
-
.cra_name = "cfb(sm4)",
3174
-
.cra_driver_name = "safexcel-cfb-sm4",
3175
-
.cra_priority = SAFEXCEL_CRA_PRIORITY,
3176
-
.cra_flags = CRYPTO_ALG_ASYNC |
3177
-
CRYPTO_ALG_ALLOCATES_MEMORY |
3178
-
CRYPTO_ALG_KERN_DRIVER_ONLY,
3179
-
.cra_blocksize = 1,
3180
-
.cra_ctxsize = sizeof(struct safexcel_cipher_ctx),
3181
-
.cra_alignmask = 0,
3182
-
.cra_init = safexcel_skcipher_sm4_cfb_cra_init,
3183
3183
.cra_exit = safexcel_skcipher_cra_exit,
3184
3184
.cra_module = THIS_MODULE,
3185
3185
},