diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-09-19 20:10:25 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-09-19 20:10:25 +1000 |
| commit | 3837c202b5e91f009d1508a8f3608c94515ca776 (patch) | |
| tree | 3673f611ffd029cf3cb2b7374c610d99a0f49165 /providers/common | |
| parent | 105dde2528d64b4af25c241288a985fdfc27afbc (diff) | |
Add aes_ocb cipher to providers
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9320)
Diffstat (limited to 'providers/common')
| -rw-r--r-- | providers/common/ciphers/cipher_locl.h | 4 | ||||
| -rw-r--r-- | providers/common/include/internal/ciphers/ciphercommon.h | 6 | ||||
| -rw-r--r-- | providers/common/include/internal/provider_algs.h | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/providers/common/ciphers/cipher_locl.h b/providers/common/ciphers/cipher_locl.h index 7e0aaad438..cc37a348ed 100644 --- a/providers/common/ciphers/cipher_locl.h +++ b/providers/common/ciphers/cipher_locl.h @@ -25,9 +25,5 @@ const OSSL_PARAM * name##_gettable_ctx_params(void) \ return name##_known_gettable_ctx_params; \ } -size_t fillblock(unsigned char *buf, size_t *buflen, size_t blocksize, - const unsigned char **in, size_t *inlen); -int trailingdata(unsigned char *buf, size_t *buflen, size_t blocksize, - const unsigned char **in, size_t *inlen); void padblock(unsigned char *buf, size_t *buflen, size_t blocksize); int unpadblock(unsigned char *buf, size_t *buflen, size_t blocksize); diff --git a/providers/common/include/internal/ciphers/ciphercommon.h b/providers/common/include/internal/ciphers/ciphercommon.h index fe55342e19..7539d8cb81 100644 --- a/providers/common/include/internal/ciphers/ciphercommon.h +++ b/providers/common/include/internal/ciphers/ciphercommon.h @@ -224,3 +224,9 @@ static int cipher_hw_##NAME##_##MODE##_cipher(PROV_CIPHER_CTX *ctx, \ ctx->num = num; \ return 1; \ } + +size_t fillblock(unsigned char *buf, size_t *buflen, size_t blocksize, + const unsigned char **in, size_t *inlen); +int trailingdata(unsigned char *buf, size_t *buflen, size_t blocksize, + const unsigned char **in, size_t *inlen); + diff --git a/providers/common/include/internal/provider_algs.h b/providers/common/include/internal/provider_algs.h index aeb7c430a0..7c0f437832 100644 --- a/providers/common/include/internal/provider_algs.h +++ b/providers/common/include/internal/provider_algs.h @@ -58,6 +58,11 @@ extern const OSSL_DISPATCH aes192ctr_functions[]; extern const OSSL_DISPATCH aes128ctr_functions[]; extern const OSSL_DISPATCH aes256xts_functions[]; extern const OSSL_DISPATCH aes128xts_functions[]; +#ifndef OPENSSL_NO_OCB +extern const OSSL_DISPATCH aes256ocb_functions[]; +extern const OSSL_DISPATCH aes192ocb_functions[]; +extern const OSSL_DISPATCH aes128ocb_functions[]; +#endif /* OPENSSL_NO_OCB */ extern const OSSL_DISPATCH aes256gcm_functions[]; extern const OSSL_DISPATCH aes192gcm_functions[]; extern const OSSL_DISPATCH aes128gcm_functions[]; |