From 4fd69672e5f9867343486cefcdfdd970465430d6 Mon Sep 17 00:00:00 2001
From: djm <>
Date: Sat, 26 Jan 2013 06:10:22 +0000
Subject: remove ACSS, crank libcrypto major; ok markus@ deraadt@

---
 src/lib/libcrypto/evp/e_acss.c | 85 ------------------------------------------
 src/lib/libcrypto/evp/evp.h    |  6 ---
 2 files changed, 91 deletions(-)
 delete mode 100644 src/lib/libcrypto/evp/e_acss.c

(limited to 'src/lib/libcrypto/evp')

diff --git a/src/lib/libcrypto/evp/e_acss.c b/src/lib/libcrypto/evp/e_acss.c
deleted file mode 100644
index 9084a63d51..0000000000
--- a/src/lib/libcrypto/evp/e_acss.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$Id: e_acss.c,v 1.3 2010/10/01 23:33:22 djm Exp $	*/
-/*
- * Copyright (c) 2004 The OpenBSD project
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef OPENSSL_NO_ACSS
-
-#include "cryptlib.h"
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include "evp_locl.h"
-#include <openssl/acss.h>
-
-typedef struct {
-    ACSS_KEY ks;
-} EVP_ACSS_KEY;
-
-#define data(ctx) EVP_C_DATA(EVP_ACSS_KEY,ctx)
-
-static int acss_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-		const unsigned char *iv, int enc);
-static int acss_ciph(EVP_CIPHER_CTX *ctx, unsigned char *out,
-		const unsigned char *in, size_t inl);
-static int acss_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr);
-static const EVP_CIPHER acss_cipher = {
-	NID_undef,
-	1,5,0,
-	0,
-	acss_init_key,
-	acss_ciph,
-	NULL,
-	sizeof(EVP_ACSS_KEY),
-	NULL,
-	NULL,
-	acss_ctrl,
-	NULL
-};
-
-const
-EVP_CIPHER *EVP_acss(void)
-{
-	return(&acss_cipher);
-}
-
-static int
-acss_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-		const unsigned char *iv, int enc)
-{
-	acss_setkey(&data(ctx)->ks,key,enc,ACSS_MODE1);
-	return 1;
-}
-
-static int
-acss_ciph(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in,
-		size_t inl)
-{
-	acss(&data(ctx)->ks,inl,in,out);
-	return 1;
-}
-
-static int
-acss_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
-{
-	switch(type) {
-	case EVP_CTRL_SET_ACSS_MODE:
-		data(ctx)->ks.mode = arg;
-		return 1;
-
-	default:
-		return -1;
-	}
-}
-#endif
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h
index aa9616e11b..3b1fa87576 100644
--- a/src/lib/libcrypto/evp/evp.h
+++ b/src/lib/libcrypto/evp/evp.h
@@ -394,9 +394,6 @@ struct evp_cipher_st
 /* Set the GCM invocation field, decrypt only */
 #define		EVP_CTRL_GCM_SET_IV_INV		0x18
 
-/* OpenBSD extension */
-#define		EVP_CTRL_SET_ACSS_MODE		0x80
-
 /* GCM TLS constants */
 /* Length of fixed part of IV derived from PRF */
 #define EVP_GCM_TLS_FIXED_IV_LEN			4
@@ -820,9 +817,6 @@ const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha1(void);
 const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha1(void);
 #endif
 #endif
-#ifndef OPENSSL_NO_ACSS
-const EVP_CIPHER *EVP_acss(void);
-#endif
 #ifndef OPENSSL_NO_CAMELLIA
 const EVP_CIPHER *EVP_camellia_128_ecb(void);
 const EVP_CIPHER *EVP_camellia_128_cbc(void);
-- 
cgit v1.2.3-55-g6feb