NetBSD-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
lib/38728: add support Camellia for openssl
>Number: 38728
>Category: lib
>Synopsis: add support Camellia for openssl
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: lib-bug-people
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Thu May 22 12:00:00 +0000 2008
>Originator: Tomoyuki Okazaki
>Release: -current
>Organization:
>Environment:
NetBSD blackhowling 4.99.63 NetBSD 4.99.63 (GENERIC) #1: Thu May 22 11:58:11
JST 2008 okazaki@blackhowling:/usr/obj/sys/arch/amd64/compile/GENERIC amd64
>Description:
Camellia is enabled openssl 0.9.9-dev by default.
I made a patch I'd like to be enabled Camellia.
>How-To-Repeat:
>Fix:
patch for -current is below:
Index: crypto/dist/openssl/crypto/opensslconf.h
===================================================================
RCS file: /cvsroot/src/crypto/dist/openssl/crypto/opensslconf.h,v
retrieving revision 1.13
diff -u -8 -p -r1.13 opensslconf.h
--- crypto/dist/openssl/crypto/opensslconf.h 9 May 2008 21:49:39 -0000
1.13
+++ crypto/dist/openssl/crypto/opensslconf.h 22 May 2008 08:41:47 -0000
@@ -1,17 +1,14 @@
/* opensslconf.h */
/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
/* OpenSSL was configured with the following options: */
#ifndef OPENSSL_DOING_MAKEDEPEND
-#ifndef OPENSSL_NO_CAMELLIA
-# define OPENSSL_NO_CAMELLIA
-#endif
#ifndef OPENSSL_NO_GMP
# define OPENSSL_NO_GMP
#endif
#ifndef OPENSSL_NO_KRB5
# define OPENSSL_NO_KRB5
#endif
#ifndef OPENSSL_NO_MDC2
# define OPENSSL_NO_MDC2
@@ -46,19 +43,16 @@
# define OPENSSL_NO_DYNAMIC_ENGINE
#endif
/* The OPENSSL_NO_* macros are also defined as NO_* if the application
asks for it. This is a transient feature that is provided for those
who haven't had the time to do the appropriate changes in their
applications. */
#ifdef OPENSSL_ALGORITHM_DEFINES
-# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
-# define NO_CAMELLIA
-# endif
# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
# define NO_GMP
# endif
# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
# define NO_KRB5
# endif
# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
# define NO_MDC2
Index: distrib/sets/lists/comp/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/comp/mi,v
retrieving revision 1.1149
diff -u -8 -p -r1.1149 mi
--- distrib/sets/lists/comp/mi 20 May 2008 12:17:48 -0000 1.1149
+++ distrib/sets/lists/comp/mi 22 May 2008 08:41:53 -0000
@@ -1651,16 +1651,17 @@
./usr/include/openssl/asn1.h comp-c-include crypto
./usr/include/openssl/asn1_mac.h comp-c-include crypto
./usr/include/openssl/asn1t.h comp-c-include crypto
./usr/include/openssl/bio.h comp-c-include crypto
./usr/include/openssl/blowfish.h comp-c-include crypto
./usr/include/openssl/bn.h comp-c-include crypto
./usr/include/openssl/buffer.h comp-c-include crypto
./usr/include/openssl/cast.h comp-c-include crypto
+./usr/include/openssl/camellia.h comp-c-include crypto
./usr/include/openssl/cms.h comp-c-include crypto
./usr/include/openssl/comp.h comp-c-include crypto
./usr/include/openssl/conf.h comp-c-include crypto
./usr/include/openssl/conf_api.h comp-c-include crypto
./usr/include/openssl/crypto.h comp-c-include crypto
./usr/include/openssl/des.h comp-c-include crypto
./usr/include/openssl/dh.h comp-c-include crypto
./usr/include/openssl/dsa.h comp-c-include crypto
Index: lib/libcrypto/Makefile
===================================================================
RCS file: /cvsroot/src/lib/libcrypto/Makefile,v
retrieving revision 1.50
diff -u -8 -p -r1.50 Makefile
--- lib/libcrypto/Makefile 10 May 2008 20:14:20 -0000 1.50
+++ lib/libcrypto/Makefile 22 May 2008 08:42:18 -0000
@@ -73,16 +73,18 @@ INCS+= aes.h asn1.h asn1_mac.h asn1t.h b
dh.h dsa.h dso.h e_os2.h ebcdic.h ec.h ecdh.h ecdsa.h engine.h \
err.h evp.h hmac.h krb5_asn.h lhash.h md2.h md4.h md5.h \
obj_mac.h objects.h ocsp.h opensslconf.h opensslv.h ossl_typ.h \
pem.h pem2.h pkcs12.h pkcs7.h rand.h rc2.h rc4.h ripemd.h \
rsa.h safestack.h sha.h stack.h store.h symhacks.h ts.h txt_db.h \
ui.h ui_compat.h x509.h x509_vfy.h x509v3.h pqueue.h
# des_old.h
+INCS+= camellia.h
+
# IDEA - patented, but we install the header anyways
INCS+= idea.h
# RC5 - patented, but we install the header anyways
INCS+= rc5.h
# MDC2 - patented, but we install the header anyways
INCS+= mdc2.h
Index: lib/libcrypto/evp.inc
===================================================================
RCS file: /cvsroot/src/lib/libcrypto/evp.inc,v
retrieving revision 1.9
diff -u -8 -p -r1.9 evp.inc
--- lib/libcrypto/evp.inc 9 May 2008 21:52:18 -0000 1.9
+++ lib/libcrypto/evp.inc 22 May 2008 08:42:18 -0000
@@ -5,17 +5,17 @@
# SRCS extracted from src/crypto/dist/openssl/crypto/evp/Makefile
#
.PATH: ${OPENSSLSRC}/crypto/evp
EVP_SRCS = encode.c digest.c evp_enc.c evp_key.c evp_acnf.c \
e_des.c e_bf.c e_idea.c e_des3.c \
- e_rc4.c e_aes.c names.c \
+ e_rc4.c e_aes.c names.c e_camellia.c \
e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c \
m_null.c m_md2.c m_md4.c m_md5.c m_sha.c m_sha1.c \
m_dss.c m_dss1.c m_mdc2.c m_ripemd.c \
p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c \
bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \
c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c \
evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c m_ecdsa.c pmeth_lib.c \
pmeth_fn.c m_sigver.c m_wp.c pmeth_gn.c
Index: lib/libcrypto/srcs.inc
===================================================================
RCS file: /cvsroot/src/lib/libcrypto/srcs.inc,v
retrieving revision 1.14
diff -u -8 -p -r1.14 srcs.inc
--- lib/libcrypto/srcs.inc 9 May 2008 21:52:18 -0000 1.14
+++ lib/libcrypto/srcs.inc 22 May 2008 08:42:18 -0000
@@ -1,15 +1,15 @@
# $NetBSD: srcs.inc,v 1.14 2008/05/09 21:52:18 christos Exp $
CRYPTOINCS= \
aes.inc asn1.inc bf.inc bio.inc bn.inc buffer.inc cast.inc \
cms.inc comp.inc conf.inc crypto.inc des.inc dh.inc dsa.inc dso.inc \
ec.inc ecdh.inc ecdsa.inc engine.inc err.inc evp.inc hmac.inc \
- krb5.inc lhash.inc \
+ krb5.inc lhash.inc camellia.inc \
md2.inc md4.inc md5.inc objects.inc ocsp.inc pem.inc \
pkcs12.inc pkcs7.inc pqueue.inc rand.inc rc2.inc rc4.inc ripemd.inc \
rsa.inc sha.inc stack.inc store.inc txt_db.inc ts.inc ui.inc x509.inc \
x509v3.inc
# patented algorithms - see ../libcrypto_*
CRYPTOINCS+= idea.inc
CRYPTOINCS+= rc5.inc
Home |
Main Index |
Thread Index |
Old Index