mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +08:00
f6c95e46c0
Add a "where did this EVP_{CIPHER,MD} come from" flag: global, via fetch,
or via EVP_{CIPHER,MD}_meth_new. Update EVP_{CIPHER,MD}_free to handle all
three origins. The flag is deliberately right before some function pointers,
so that compile-time failures (int/pointer) will occur, as opposed to
taking a bit in the existing "flags" field. The "global variable" flag
is non-zero, so the default case of using OPENSSL_zalloc (for provider
ciphers), will do the right thing. Ref-counting is a no-op for
Make up_ref no-op for global MD and CIPHER objects
Deprecate EVP_MD_CTX_md(). Added EVP_MD_CTX_get0_md() (same semantics as
the deprecated function) and EVP_MD_CTX_get1_md(). Likewise, deprecate
EVP_CIPHER_CTX_cipher() in favor of EVP_CIPHER_CTX_get0_cipher(), and add
EVP_CIPHER_CTX_get1_CIPHER().
Refactor EVP_MD_free() and EVP_MD_meth_free() to call new common
evp_md_free_int() function.
Refactor EVP_CIPHER_free() and EVP_CIPHER_meth_free() to call new common
evp_cipher_free_int() function.
Also change some flags tests to explicit test == or != zero. E.g.,
if (flags & x) --> if ((flags & x) != 0)
if (!(flags & x)) --> if ((flags & x) == 0)
Only done for those lines where "get0_cipher" calls were made.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14193)
95 lines
2.1 KiB
C
95 lines
2.1 KiB
C
/*
|
|
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
/*
|
|
* RC4 low level APIs are deprecated for public use, but still ok for internal
|
|
* use.
|
|
*/
|
|
#include "internal/deprecated.h"
|
|
|
|
#include <stdio.h>
|
|
#include "internal/cryptlib.h"
|
|
|
|
#ifndef OPENSSL_NO_RC4
|
|
|
|
# include <openssl/evp.h>
|
|
# include <openssl/objects.h>
|
|
# include <openssl/rc4.h>
|
|
|
|
# include "crypto/evp.h"
|
|
|
|
typedef struct {
|
|
RC4_KEY ks; /* working key */
|
|
} EVP_RC4_KEY;
|
|
|
|
# define data(ctx) ((EVP_RC4_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx))
|
|
|
|
static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
|
|
const unsigned char *iv, int enc);
|
|
static int rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
|
|
const unsigned char *in, size_t inl);
|
|
static const EVP_CIPHER r4_cipher = {
|
|
NID_rc4,
|
|
1, EVP_RC4_KEY_SIZE, 0,
|
|
EVP_CIPH_VARIABLE_LENGTH,
|
|
EVP_ORIG_GLOBAL,
|
|
rc4_init_key,
|
|
rc4_cipher,
|
|
NULL,
|
|
sizeof(EVP_RC4_KEY),
|
|
NULL,
|
|
NULL,
|
|
NULL,
|
|
NULL
|
|
};
|
|
|
|
static const EVP_CIPHER r4_40_cipher = {
|
|
NID_rc4_40,
|
|
1, 5 /* 40 bit */ , 0,
|
|
EVP_CIPH_VARIABLE_LENGTH,
|
|
EVP_ORIG_GLOBAL,
|
|
rc4_init_key,
|
|
rc4_cipher,
|
|
NULL,
|
|
sizeof(EVP_RC4_KEY),
|
|
NULL,
|
|
NULL,
|
|
NULL,
|
|
NULL
|
|
};
|
|
|
|
const EVP_CIPHER *EVP_rc4(void)
|
|
{
|
|
return &r4_cipher;
|
|
}
|
|
|
|
const EVP_CIPHER *EVP_rc4_40(void)
|
|
{
|
|
return &r4_40_cipher;
|
|
}
|
|
|
|
static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
|
|
const unsigned char *iv, int enc)
|
|
{
|
|
int keylen;
|
|
|
|
if ((keylen = EVP_CIPHER_CTX_key_length(ctx)) <= 0)
|
|
return 0;
|
|
RC4_set_key(&data(ctx)->ks, keylen, key);
|
|
return 1;
|
|
}
|
|
|
|
static int rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
|
|
const unsigned char *in, size_t inl)
|
|
{
|
|
RC4(&data(ctx)->ks, inl, in, out);
|
|
return 1;
|
|
}
|
|
#endif
|