5 files changed, 17 insertions, 5 deletions

diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h
index 7b234d0ad6..5d8a07d33c 100644
--- a/src/lib/libcrypto/evp/evp.h
+++ b/src/lib/libcrypto/evp/evp.h
@@ -326,6 +326,7 @@ struct evp_cipher_st
 #define         EVP_CTRL_SET_RC2_KEY_BITS       0x3
 #define         EVP_CTRL_GET_RC5_ROUNDS         0x4
 #define         EVP_CTRL_SET_RC5_ROUNDS         0x5
+#define         EVP_CTRL_SET_ACSS_MODE          0x6
 
 typedef struct evp_cipher_info_st
         {
@@ -663,6 +664,9 @@ const EVP_CIPHER *EVP_aes_256_ofb(void);
 const EVP_CIPHER *EVP_aes_256_ctr(void);
 #endif
 #endif
+#ifndef OPENSSL_NO_ACSS
+const EVP_CIPHER *EVP_acss(void);
+#endif
 
 void OPENSSL_add_all_algorithms_noconf(void);
 void OPENSSL_add_all_algorithms_conf(void);
diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile
index 330d32046a..c5f6eb8634 100644
--- a/src/lib/libssl/crypto/Makefile
+++ b/src/lib/libssl/crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2003/11/19 21:06:45 millert Exp $
+# $OpenBSD: Makefile,v 1.34 2004/01/23 17:02:25 hshoexer Exp $
 
 LIB=    crypto
 
@@ -42,6 +42,7 @@ SRCS+=	sha_dgst.c sha1dgst.c sha_one.c sha1_one.c
 #SRCS+= mdc2dgst.c mdc2_one.c                                   
 SRCS+=  hmac.c                                                  
 SRCS+=  rmd_dgst.c rmd_one.c                            
+SRCS+=  acss_skey.c acss_enc.c
 SRCS+= aes_cbc.c aes_cfb.c aes_ctr.c aes_ecb.c aes_ofb.c aes_misc.c aes_core.c
 SRCS+=  cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \
         ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c \
@@ -91,7 +92,7 @@ SRCS+= c_all.c evp_err.c evp_acnf.c m_md4.c p5_crpt.c
 SRCS+= c_allc.c evp_key.c m_md5.c p5_crpt2.c
 SRCS+= c_alld.c e_null.c evp_lib.c p_dec.c
 SRCS+= digest.c e_rc2.c evp_pbe.c m_null.c p_enc.c
-SRCS+= e_aes.c e_rc4.c evp_pkey.c m_ripemd.c p_lib.c
+SRCS+= e_acss.c e_aes.c e_rc4.c evp_pkey.c m_ripemd.c p_lib.c
 SRCS+= md4_dgst.c md4_one.c
 SRCS+=  pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_pkey.c   
 SRCS+=  pem_all.c pem_err.c pem_x509.c pem_pk8.c pem_oth.c pem_xaux.c
@@ -152,9 +153,10 @@ SRCS+= ec_err.c ec_mult.c ecp_nist.c ecp_smpl.c
         ${LCRYPTO_SRC}/comp ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC}/md4 \
         ${LCRYPTO_SRC}/engine ${LCRYPTO_SRC}/dso ${LCRYPTO_SRC}/ui \
         ${LCRYPTO_SRC}/ocsp ${LCRYPTO_SRC}/ec ${LCRYPTO_SRC}/aes ${LCRYPTO_SRC} \
-        ${.CURDIR}/arch/${MACHINE_ARCH}
+        ${LCRYPTO_SRC}/acss ${.CURDIR}/arch/${MACHINE_ARCH}
 
 HDRS=\
+        crypto/acss/acss.h \
         crypto/aes/aes.h \
         crypto/asn1/asn1.h \
         crypto/asn1/asn1_mac.h \
diff --git a/src/lib/libssl/crypto/shlib_version b/src/lib/libssl/crypto/shlib_version
index a31d18257c..bab3bd7a1b 100644
--- a/src/lib/libssl/crypto/shlib_version
+++ b/src/lib/libssl/crypto/shlib_version
@@ -1,2 +1,2 @@
 major=10
-minor=1
+minor=2
diff --git a/src/lib/libssl/man/Makefile b/src/lib/libssl/man/Makefile
index b591fc36ba..0eb914ea26 100644
--- a/src/lib/libssl/man/Makefile
+++ b/src/lib/libssl/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2003/07/02 02:15:51 deraadt Exp $
+# $OpenBSD: Makefile,v 1.6 2004/01/23 17:02:25 hshoexer Exp $
 
 .include <bsd.own.mk>           # for NOMAN
 
@@ -161,6 +161,7 @@ MANALL=	\
         SSL_want.cat3 \
         SSL_write.cat3 \
         blowfish.cat3 \
+        acss.cat3 \
         bn.cat3 \
         bn_internal.cat3 \
         crypto.cat3 \
@@ -712,6 +713,7 @@ MLINKS+=\
         SSL_want.3 SSL_want_read.3 \
         SSL_want.3 SSL_want_write.3 \
         SSL_want.3 SSL_want_x509_lookup.3 \
+        acss.3 acss_setkey.3 \
         blowfish.3 BF_cbc.3 \
         blowfish.3 BF_cbc_encrypt.3 \
         blowfish.3 BF_cfb64_encrypt.3 \
diff --git a/src/lib/libssl/src/crypto/evp/evp.h b/src/lib/libssl/src/crypto/evp/evp.h
index 7b234d0ad6..5d8a07d33c 100644
--- a/src/lib/libssl/src/crypto/evp/evp.h
+++ b/src/lib/libssl/src/crypto/evp/evp.h
@@ -326,6 +326,7 @@ struct evp_cipher_st
 #define         EVP_CTRL_SET_RC2_KEY_BITS       0x3
 #define         EVP_CTRL_GET_RC5_ROUNDS         0x4
 #define         EVP_CTRL_SET_RC5_ROUNDS         0x5
+#define         EVP_CTRL_SET_ACSS_MODE          0x6
 
 typedef struct evp_cipher_info_st
         {
@@ -663,6 +664,9 @@ const EVP_CIPHER *EVP_aes_256_ofb(void);
 const EVP_CIPHER *EVP_aes_256_ctr(void);
 #endif
 #endif
+#ifndef OPENSSL_NO_ACSS
+const EVP_CIPHER *EVP_acss(void);
+#endif
 
 void OPENSSL_add_all_algorithms_noconf(void);
 void OPENSSL_add_all_algorithms_conf(void);