Date: Sat, 13 Jun 2009 16:45:58 +0000 (UTC) From: "Simon L. Nielsen" <simon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r194121 - projects/openssl_098_merge_8/secure/lib/libcrypto Message-ID: <200906131645.n5DGjwpT019368@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: simon Date: Sat Jun 13 16:45:58 2009 New Revision: 194121 URL: http://svn.freebsd.org/changeset/base/194121 Log: After further thought, for now disable SEED and CMS as they are not enabled upstream by default in 0.9.8. Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-amd64.h projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-arm.h projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-i386.h projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-ia64.h projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-mips.h projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-powerpc.h projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-sparc64.h Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile ============================================================================== --- projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile Sat Jun 13 16:34:39 2009 (r194120) +++ projects/openssl_098_merge_8/secure/lib/libcrypto/Makefile Sat Jun 13 16:45:58 2009 (r194121) @@ -325,17 +325,17 @@ SRCS+= pcy_cache.c pcy_data.c pcy_lib.c INCS+= x509v3.h # cms -SRCS+= cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c cms_err.c \ - cms_sd.c cms_dd.c cms_cd.c cms_env.c cms_enc.c cms_ess.c -INCS+= cms.h +#SRCS+= cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c cms_err.c \ +# cms_sd.c cms_dd.c cms_cd.c cms_env.c cms_enc.c cms_ess.c +#INCS+= cms.h # jpake - is marked experimental #SRCS+= jpake.c jpake_err.c #INCS+= jpake.h # seed -SRCS+= seed.c seed_ecb.c seed_cbc.c seed_cfb.c seed_ofb.c -INCS+= seed.h +#SRCS+= seed.c seed_ecb.c seed_cbc.c seed_cfb.c seed_ofb.c +#INCS+= seed.h SRCS+= buildinf.h INCS+= opensslconf.h evp.h Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-amd64.h ============================================================================== --- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-amd64.h Sat Jun 13 16:34:39 2009 (r194120) +++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-amd64.h Sat Jun 13 16:45:58 2009 (r194121) @@ -5,6 +5,14 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND +/* Disabled by default in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_CMS +# define OPENSSL_NO_CMS +#endif +/* Disabled by default in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_SEED +# define OPENSSL_NO_SEED +#endif /* libgmp is not in the FreeBSD base system. */ #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-arm.h ============================================================================== --- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-arm.h Sat Jun 13 16:34:39 2009 (r194120) +++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-arm.h Sat Jun 13 16:45:58 2009 (r194121) @@ -9,6 +9,14 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +/* Disabled by default in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_CMS +# define OPENSSL_NO_CMS +#endif +/* Disabled by default in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_SEED +# define OPENSSL_NO_SEED +#endif /* libgmp is not in the FreeBSD base system. */ #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-i386.h ============================================================================== --- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-i386.h Sat Jun 13 16:34:39 2009 (r194120) +++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-i386.h Sat Jun 13 16:45:58 2009 (r194121) @@ -5,6 +5,14 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND +/* Disabled by default in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_CMS +# define OPENSSL_NO_CMS +#endif +/* Disabled by default in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_SEED +# define OPENSSL_NO_SEED +#endif /* libgmp is not in the FreeBSD base system. */ #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-ia64.h ============================================================================== --- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-ia64.h Sat Jun 13 16:34:39 2009 (r194120) +++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-ia64.h Sat Jun 13 16:45:58 2009 (r194121) @@ -9,6 +9,14 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +/* Disabled by default in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_CMS +# define OPENSSL_NO_CMS +#endif +/* Disabled by default in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_SEED +# define OPENSSL_NO_SEED +#endif /* jpake is marked experimental in OpenSSL 0.9.8. */ #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-mips.h ============================================================================== --- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-mips.h Sat Jun 13 16:34:39 2009 (r194120) +++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-mips.h Sat Jun 13 16:45:58 2009 (r194121) @@ -9,6 +9,14 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +/* Disabled by default in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_CMS +# define OPENSSL_NO_CMS +#endif +/* Disabled by default in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_SEED +# define OPENSSL_NO_SEED +#endif /* jpake is marked experimental in OpenSSL 0.9.8. */ #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-powerpc.h ============================================================================== --- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-powerpc.h Sat Jun 13 16:34:39 2009 (r194120) +++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-powerpc.h Sat Jun 13 16:45:58 2009 (r194121) @@ -9,6 +9,14 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +/* Disabled by default in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_CMS +# define OPENSSL_NO_CMS +#endif +/* Disabled by default in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_SEED +# define OPENSSL_NO_SEED +#endif /* jpake is marked experimental in OpenSSL 0.9.8. */ #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE Modified: projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-sparc64.h ============================================================================== --- projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-sparc64.h Sat Jun 13 16:34:39 2009 (r194120) +++ projects/openssl_098_merge_8/secure/lib/libcrypto/opensslconf-sparc64.h Sat Jun 13 16:45:58 2009 (r194121) @@ -9,6 +9,14 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +/* Disabled by default in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_CMS +# define OPENSSL_NO_CMS +#endif +/* Disabled by default in OpenSSL 0.9.8. */ +#ifndef OPENSSL_NO_SEED +# define OPENSSL_NO_SEED +#endif /* jpake is marked experimental in OpenSSL 0.9.8. */ #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906131645.n5DGjwpT019368>