-# $OpenBSD: Makefile,v 1.161 2023/12/29 06:17:58 tb Exp $
+# $OpenBSD: Makefile,v 1.162 2023/12/29 06:56:38 tb Exp $
LIB= crypto
LIBREBUILD=y
SRCS+= bio_enc.c
SRCS+= bio_md.c
SRCS+= c_all.c
-SRCS+= cipher_method_lib.c
SRCS+= e_aes.c
SRCS+= e_aes_cbc_hmac_sha1.c
SRCS+= e_bf.c
+++ /dev/null
-/* $OpenBSD: cipher_method_lib.c,v 1.11 2023/12/20 14:05:58 tb Exp $ */
-/*
- * Written by Richard Levitte (levitte@openssl.org) for the OpenSSL project
- * 2015.
- */
-/* ====================================================================
- * Copyright (c) 2015 The OpenSSL Project. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdlib.h>
-
-#include <openssl/evp.h>
-
-#include "evp_local.h"
-
-EVP_CIPHER *
-EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len)
-{
- EVP_CIPHER *cipher;
-
- if (cipher_type < 0 || key_len < 0)
- return NULL;
-
- /* EVP_CipherInit() will fail for any other value. */
- if (block_size != 1 && block_size != 8 && block_size != 16)
- return NULL;
-
- if ((cipher = calloc(1, sizeof(*cipher))) == NULL)
- return NULL;
-
- cipher->nid = cipher_type;
- cipher->block_size = block_size;
- cipher->key_len = key_len;
-
- return cipher;
-}
-
-EVP_CIPHER *
-EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher)
-{
- EVP_CIPHER *copy;
-
- if ((copy = calloc(1, sizeof(*copy))) == NULL)
- return NULL;
-
- *copy = *cipher;
-
- return copy;
-}
-
-void
-EVP_CIPHER_meth_free(EVP_CIPHER *cipher)
-{
- free(cipher);
-}
-
-int
-EVP_CIPHER_meth_set_iv_length(EVP_CIPHER *cipher, int iv_len)
-{
- cipher->iv_len = iv_len;
-
- return 1;
-}
-
-int
-EVP_CIPHER_meth_set_flags(EVP_CIPHER *cipher, unsigned long flags)
-{
- cipher->flags = flags;
-
- return 1;
-}
-
-int
-EVP_CIPHER_meth_set_impl_ctx_size(EVP_CIPHER *cipher, int ctx_size)
-{
- cipher->ctx_size = ctx_size;
-
- return 1;
-}
-
-int
-EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher,
- int (*init)(EVP_CIPHER_CTX *ctx, const unsigned char *key,
- const unsigned char *iv, int enc))
-{
- cipher->init = init;
-
- return 1;
-}
-
-int
-EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher,
- int (*do_cipher)(EVP_CIPHER_CTX *ctx, unsigned char *out,
- const unsigned char *in, size_t inl))
-{
- cipher->do_cipher = do_cipher;
-
- return 1;
-}
-
-int
-EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher,
- int (*cleanup)(EVP_CIPHER_CTX *))
-{
- cipher->cleanup = cleanup;
-
- return 1;
-}
-
-int
-EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher,
- int (*set_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *))
-{
- cipher->set_asn1_parameters = set_asn1_parameters;
-
- return 1;
-}
-
-int
-EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher,
- int (*get_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *))
-{
- cipher->get_asn1_parameters = get_asn1_parameters;
-
- return 1;
-}
-
-int
-EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher,
- int (*ctrl)(EVP_CIPHER_CTX *, int type, int arg, void *ptr))
-{
- cipher->ctrl = ctrl;
-
- return 1;
-}
-/* $OpenBSD: evp_cipher.c,v 1.2 2023/12/29 06:17:58 tb Exp $ */
+/* $OpenBSD: evp_cipher.c,v 1.3 2023/12/29 06:56:38 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
* copied and put under another distribution licence
* [including the GNU Public Licence.]
*/
+/* ====================================================================
+ * Copyright (c) 2015 The OpenSSL Project. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ * software must display the following acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For written permission, please contact
+ * licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ * nor may "OpenSSL" appear in their names without prior written
+ * permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com). This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
#include <limits.h>
#include <stdio.h>
{
return (ctx->flags & flags);
}
+
+EVP_CIPHER *
+EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len)
+{
+ EVP_CIPHER *cipher;
+
+ if (cipher_type < 0 || key_len < 0)
+ return NULL;
+
+ /* EVP_CipherInit() will fail for any other value. */
+ if (block_size != 1 && block_size != 8 && block_size != 16)
+ return NULL;
+
+ if ((cipher = calloc(1, sizeof(*cipher))) == NULL)
+ return NULL;
+
+ cipher->nid = cipher_type;
+ cipher->block_size = block_size;
+ cipher->key_len = key_len;
+
+ return cipher;
+}
+
+EVP_CIPHER *
+EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher)
+{
+ EVP_CIPHER *copy;
+
+ if ((copy = calloc(1, sizeof(*copy))) == NULL)
+ return NULL;
+
+ *copy = *cipher;
+
+ return copy;
+}
+
+void
+EVP_CIPHER_meth_free(EVP_CIPHER *cipher)
+{
+ free(cipher);
+}
+
+int
+EVP_CIPHER_meth_set_iv_length(EVP_CIPHER *cipher, int iv_len)
+{
+ cipher->iv_len = iv_len;
+
+ return 1;
+}
+
+int
+EVP_CIPHER_meth_set_flags(EVP_CIPHER *cipher, unsigned long flags)
+{
+ cipher->flags = flags;
+
+ return 1;
+}
+
+int
+EVP_CIPHER_meth_set_impl_ctx_size(EVP_CIPHER *cipher, int ctx_size)
+{
+ cipher->ctx_size = ctx_size;
+
+ return 1;
+}
+
+int
+EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher,
+ int (*init)(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+ const unsigned char *iv, int enc))
+{
+ cipher->init = init;
+
+ return 1;
+}
+
+int
+EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher,
+ int (*do_cipher)(EVP_CIPHER_CTX *ctx, unsigned char *out,
+ const unsigned char *in, size_t inl))
+{
+ cipher->do_cipher = do_cipher;
+
+ return 1;
+}
+
+int
+EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher,
+ int (*cleanup)(EVP_CIPHER_CTX *))
+{
+ cipher->cleanup = cleanup;
+
+ return 1;
+}
+
+int
+EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher,
+ int (*set_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *))
+{
+ cipher->set_asn1_parameters = set_asn1_parameters;
+
+ return 1;
+}
+
+int
+EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher,
+ int (*get_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *))
+{
+ cipher->get_asn1_parameters = get_asn1_parameters;
+
+ return 1;
+}
+
+int
+EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher,
+ int (*ctrl)(EVP_CIPHER_CTX *, int type, int arg, void *ptr))
+{
+ cipher->ctrl = ctrl;
+
+ return 1;
+}
projects / openbsd / commitdiff