OpenSSL: OpenSSL_0_9_8-stable: openssl/ Configure openssl/crypto...

Thread: OpenSSL: OpenSSL_0_9_8-stable: openssl/ Configure openssl/crypto...

Search this list only Search all lists
OpenSSL: OpenSSL_0_9_8-stable: openssl/ Configure openssl/crypto...
	2006-11-30 13:04:45
OpenSSL CVS Repository http://cvs.openssl.org/ ____________________________________________________________ ________________ Server: cvs.openssl.org Name: Dr. Stephen Henson Root: /v/openssl/cvs Email: steveopenssl.org Module: openssl Date: 30-Nov-2006 14:04:44 Branch: OpenSSL_0_9_8-stable Handle: 2006113013043904 Modified files: (Branch: OpenSSL_0_9_8-stable) openssl Configure openssl/crypto/x509v3 v3_addr.c x509v3.h openssl/ssl ssl_sess.c openssl/util libeay.num mk1mf.pl mkdef.pl ssleay.num Log: Win32 fixes. Use OPENSSL_NO_RFC3779 instead of OPENSSL_RFC3779: this makes the Win32 scripts work and is consistent with other options. Fix Win32 scripts and Configure to process OPENSSL_NO_RFC3779 properly. Update ordinals. Change some prototypes for LSB because VC++ 6 doesn't like the / sequence and thinks it is an invalid end of comment. Summary: Revision Changes Path 1.488.2.33 +2 -9 openssl/Configure 1.1.2.2 +1 -1 openssl/crypto/x509v3/v3_addr.c 1.100.2.3 +1 -1 openssl/crypto/x509v3/x509v3.h 1.51.2.4 +7 -7 openssl/ssl/ssl_sess.c 1.248.2.6 +101 -0 openssl/util/libeay.num 1.61.2.15 +1 -0 openssl/util/mk1mf.pl 1.92.2.5 +5 -0 openssl/util/mkdef.pl 1.44.2.1 +12 -0 openssl/util/ssleay.num ____________________________________________________________ ________________ patch -p0 <<' .' Index: openssl/Configure ============================================================ ================ $ cvs diff -u -r1.488.2.32 -r1.488.2.33 Configure --- openssl/Configure 27 Nov 2006 13:36:51 -0000 1.488.2.32 +++ openssl/Configure 30 Nov 2006 13:04:39 -0000 1.488.2.33 -568,7 +568,7 my $no_shared=0; # but "no-shared" is default my $zlib=1; # but "no-zlib" is default my $no_krb5=0; # but "no-krb5" is implied unless "--with-krb5-..." is used -my $rfc3779=1; # but "no-rfc3779" is default +my $no_rfc3779=1; # but "no-rfc3779" is default my $no_asm=0; my $no_dso=0; my $no_gmp=0; -616,7 +616,7 # For symmetry, "disable-..." is a synonym for "no-...". # This is what $depflags will look like with the above default: -my $default_depflags = "-DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 "; +my $default_depflags = "-DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779"; my $no_sse2=0; -885,8 +885,6 { $symlink = 0; } elsif (/^sse2$/) { $no_sse2 = 1; } - elsif (/^rfc3779$/) - { $rfc3779 = 0; } else { my ($ALGO, $algo); -1124,11 +1122,6 } } -if ($rfc3779) - { - $openssl_other_defines.="#define OPENSSL_RFC3779n"; - } - # You will find shlib_mark1 and shlib_mark2 explained in Makefile.org my $shared_mark = ""; if ($shared_target eq "") . patch -p0 <<' .' Index: openssl/crypto/x509v3/v3_addr.c ============================================================ ================ $ cvs diff -u -r1.1.2.1 -r1.1.2.2 v3_addr.c --- openssl/crypto/x509v3/v3_addr.c 27 Nov 2006 13:36:54 -0000 1.1.2.1 +++ openssl/crypto/x509v3/v3_addr.c 30 Nov 2006 13:04:40 -0000 1.1.2.2 -68,7 +68,7 #include <openssl/asn1t.h> #include <openssl/x509v3.h> -#ifdef OPENSSL_RFC3779 +#ifndef OPENSSL_NO_RFC3779 / * OpenSSL ASN.1 template translation of RFC 3779 2.2.3. . patch -p0 <<' .' Index: openssl/crypto/x509v3/x509v3.h ============================================================ ================ $ cvs diff -u -r1.100.2.2 -r1.100.2.3 x509v3.h --- openssl/crypto/x509v3/x509v3.h 27 Nov 2006 13:36:55 -0000 1.100.2.2 +++ openssl/crypto/x509v3/x509v3.h 30 Nov 2006 13:04:41 -0000 1.100.2.3 -626,7 +626,7 void X509_POLICY_NODE_print(BIO out, X509_POLICY_NODE node, int indent); -#ifdef OPENSSL_RFC3779 +#ifndef OPENSSL_NO_RFC3779 typedef struct ASRange_st { ASN1_INTEGER min, max; . patch -p0 <<' .' Index: openssl/ssl/ssl_sess.c ============================================================ ================ $ cvs diff -u -r1.51.2.3 -r1.51.2.4 ssl_sess.c --- openssl/ssl/ssl_sess.c 29 Nov 2006 20:47:15 -0000 1.51.2.3 +++ openssl/ssl/ssl_sess.c 30 Nov 2006 13:04:41 -0000 1.51.2.4 -771,18 +771,18 ctx->new_session_cb=cb; } -int (SSL_CTX_sess_get_new_cb(SSL_CTX ctx))(struct ssl_st /ssl/,SSL_SESSION /sess/) +int (SSL_CTX_sess_get_new_cb(SSL_CTX ctx))(SSL ssl, SSL_SESSION sess) { return ctx->new_session_cb; } void SSL_CTX_sess_set_remove_cb(SSL_CTX ctx, - void (cb)(struct ssl_ctx_st ctx,SSL_SESSION sess)) + void (cb)(SSL_CTX ctx,SSL_SESSION sess)) { ctx->remove_session_cb=cb; } -void (SSL_CTX_sess_get_remove_cb(SSL_CTX ctx))(struct ssl_ctx_st /ctx/,SSL_SESSION /sess/) +void (SSL_CTX_sess_get_remove_cb(SSL_CTX ctx))(SSL_CTX ctx,SSL_SESSION sess) { return ctx->remove_session_cb; } -794,8 +794,8 ctx->get_session_cb=cb; } -SSL_SESSION (SSL_CTX_sess_get_get_cb(SSL_CTX ctx))(struct ssl_st /ssl/, - unsigned char /data/,int /len/,int /copy/) +SSL_SESSION (SSL_CTX_sess_get_get_cb(SSL_CTX ctx))(SSL ssl, + unsigned char data,int len,int copy) { return ctx->get_session_cb; } -806,7 +806,7 ctx->info_callback=cb; } -void (SSL_CTX_get_info_callback(SSL_CTX ctx))(const SSL /ssl/,int /type/,int /val/) +void (SSL_CTX_get_info_callback(SSL_CTX ctx))(const SSL ssl,int type,int val) { return ctx->info_callback; } -817,7 +817,7 ctx->client_cert_cb=cb; } -int (SSL_CTX_get_client_cert_cb(SSL_CTX ctx))(SSL /ssl /, X509 */ x509 /, EVP_PKEY /pkey/) +int (SSL_CTX_get_client_cert_cb(SSL_CTX ctx))(SSL ssl, X509 x509 , EVP_PKEY pkey) { return ctx->client_cert_cb; } . patch -p0 <<' .' Index: openssl/util/libeay.num ============================================================ ================ $ cvs diff -u -r1.248.2.5 -r1.248.2.6 libeay.num --- openssl/util/libeay.num 9 Jun 2006 15:42:20 -0000 1.248.2.5 +++ openssl/util/libeay.num 30 Nov 2006 13:04:42 -0000 1.248.2.6 -3409,3 +3409,104 EVP_camellia_256_cfb8 3810 EXIST::FUNCTION:CAMELLIA EVP_camellia_256_ecb 3811 EXIST::FUNCTION:CAMELLIA EVP_camellia_256_ofb 3812 EXIST::FUNCTION:CAMELLIA +a2i_ipadd 3813 EXIST::FUNCTION: +ASIdentifiers_free 3814 EXIST::FUNCTION:RFC3779 +i2d_ASIdOrRange 3815 EXIST::FUNCTION:RFC3779 +EVP_CIPHER_block_size 3816 EXIST::FUNCTION: +v3_asid_is_canonical 3817 EXIST::FUNCTION:RFC3779 +IPAddressChoice_free 3818 EXIST::FUNCTION:RFC3779 +EVP_CIPHER_CTX_set_app_data 3819 EXIST::FUNCTION: +BIO_set_callback_arg 3820 EXIST::FUNCTION: +v3_addr_add_prefix 3821 EXIST::FUNCTION:RFC3779 +IPAddressOrRange_it 3822 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779 +IPAddressOrRange_it 3822 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779 +BIO_set_flags 3823 EXIST::FUNCTION: +ASIdentifiers_it 3824 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779 +ASIdentifiers_it 3824 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779 +v3_addr_get_range 3825 EXIST::FUNCTION:RFC3779 +BIO_method_type 3826 EXIST::FUNCTION: +v3_addr_inherits 3827 EXIST::FUNCTION:RFC3779 +IPAddressChoice_it 3828 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779 +IPAddressChoice_it 3828 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779 +AES_ige_encrypt 3829 EXIST::FUNCTION:AES +v3_addr_add_range 3830 EXIST::FUNCTION:RFC3779 +EVP_CIPHER_CTX_nid 3831 EXIST::FUNCTION: +d2i_ASRange 3832 EXIST::FUNCTION:RFC3779 +v3_addr_add_inherit 3833 EXIST::FUNCTION:RFC3779 +v3_asid_add_id_or_range 3834 EXIST::FUNCTION:RFC3779 +v3_addr_validate_resource_set 3835 EXIST::FUNCTION:RFC3779 +EVP_CIPHER_iv_length 3836 EXIST::FUNCTION: +EVP_MD_type 3837 EXIST::FUNCTION: +v3_asid_canonize 3838 EXIST::FUNCTION:RFC3779 +IPAddressRange_free 3839 EXIST::FUNCTION:RFC3779 +v3_asid_add_inherit 3840 EXIST::FUNCTION:RFC3779 +EVP_CIPHER_CTX_key_length 3841 EXIST::FUNCTION: +IPAddressRange_new 3842 EXIST::FUNCTION:RFC3779 +ASIdOrRange_new 3843 EXIST::FUNCTION:RFC3779 +EVP_MD_size 3844 EXIST::FUNCTION: +EVP_MD_CTX_test_flags 3845 EXIST::FUNCTION: +BIO_clear_flags 3846 EXIST::FUNCTION: +i2d_ASRange 3847 EXIST::FUNCTION:RFC3779 +IPAddressRange_it 3848 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779 +IPAddressRange_it 3848 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779 +IPAddressChoice_new 3849 EXIST::FUNCTION:RFC3779 +ASIdentifierChoice_new 3850 EXIST::FUNCTION:RFC3779 +ASRange_free 3851 EXIST::FUNCTION:RFC3779 +EVP_MD_pkey_type 3852 EXIST::FUNCTION: +EVP_MD_CTX_clear_flags 3853 EXIST::FUNCTION: +IPAddressFamily_free 3854 EXIST::FUNCTION:RFC3779 +i2d_IPAddressFamily 3855 EXIST::FUNCTION:RFC3779 +IPAddressOrRange_new 3856 EXIST::FUNCTION:RFC3779 +EVP_CIPHER_flags 3857 EXIST::FUNCTION: +v3_asid_validate_resource_set 3858 EXIST::FUNCTION:RFC3779 +d2i_IPAddressRange 3859 EXIST::FUNCTION:RFC3779 +AES_bi_ige_encrypt 3860 EXIST::FUNCTION:AES +BIO_get_callback 3861 EXIST::FUNCTION: +IPAddressOrRange_free 3862 EXIST::FUNCTION:RFC3779 +v3_addr_subset 3863 EXIST::FUNCTION:RFC3779 +d2i_IPAddressFamily 3864 EXIST::FUNCTION:RFC3779 +v3_asid_subset 3865 EXIST::FUNCTION:RFC3779 +BIO_test_flags 3866 EXIST::FUNCTION: +i2d_ASIdentifierChoice 3867 EXIST::FUNCTION:RFC3779 +ASRange_it 3868 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779 +ASRange_it 3868 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779 +d2i_ASIdentifiers 3869 EXIST::FUNCTION:RFC3779 +ASRange_new 3870 EXIST::FUNCTION:RFC3779 +d2i_IPAddressChoice 3871 EXIST::FUNCTION:RFC3779 +v3_addr_get_afi 3872 EXIST::FUNCTION:RFC3779 +EVP_CIPHER_key_length 3873 EXIST::FUNCTION: +EVP_Cipher 3874 EXIST::FUNCTION: +i2d_IPAddressOrRange 3875 EXIST::FUNCTION:RFC3779 +ASIdOrRange_it 3876 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779 +ASIdOrRange_it 3876 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779 +EVP_CIPHER_nid 3877 EXIST::FUNCTION: +i2d_IPAddressChoice 3878 EXIST::FUNCTION:RFC3779 +EVP_CIPHER_CTX_block_size 3879 EXIST::FUNCTION: +ASIdentifiers_new 3880 EXIST::FUNCTION:RFC3779 +v3_addr_validate_path 3881 EXIST::FUNCTION:RFC3779 +IPAddressFamily_new 3882 EXIST::FUNCTION:RFC3779 +EVP_MD_CTX_set_flags 3883 EXIST::FUNCTION: +v3_addr_is_canonical 3884 EXIST::FUNCTION:RFC3779 +i2d_IPAddressRange 3885 EXIST::FUNCTION:RFC3779 +IPAddressFamily_it 3886 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779 +IPAddressFamily_it 3886 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779 +v3_asid_inherits 3887 EXIST::FUNCTION:RFC3779 +EVP_CIPHER_CTX_cipher 3888 EXIST::FUNCTION: +EVP_CIPHER_CTX_get_app_data 3889 EXIST::FUNCTION: +EVP_MD_block_size 3890 EXIST::FUNCTION: +EVP_CIPHER_CTX_flags 3891 EXIST::FUNCTION: +v3_asid_validate_path 3892 EXIST::FUNCTION:RFC3779 +d2i_IPAddressOrRange 3893 EXIST::FUNCTION:RFC3779 +v3_addr_canonize 3894 EXIST::FUNCTION:RFC3779 +ASIdentifierChoice_it 3895 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RFC3779 +ASIdentifierChoice_it 3895 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RFC3779 +EVP_MD_CTX_md 3896 EXIST::FUNCTION: +d2i_ASIdentifierChoice 3897 EXIST::FUNCTION:RFC3779 +BIO_method_name 3898 EXIST::FUNCTION: +EVP_CIPHER_CTX_iv_length 3899 EXIST::FUNCTION: +ASIdOrRange_free 3900 EXIST::FUNCTION:RFC3779 +ASIdentifierChoice_free 3901 EXIST::FUNCTION:RFC3779 +BIO_get_callback_arg 3902 EXIST::FUNCTION: +BIO_set_callback 3903 EXIST::FUNCTION: +d2i_ASIdOrRange 3904 EXIST::FUNCTION:RFC3779 +i2d_ASIdentifiers 3905 EXIST::FUNCTION:RFC3779 . patch -p0 <<' .' Index: openssl/util/mk1mf.pl ============================================================ ================ $ cvs diff -u -r1.61.2.14 -r1.61.2.15 mk1mf.pl --- openssl/util/mk1mf.pl 9 Jun 2006 15:42:21 -0000 1.61.2.14 +++ openssl/util/mk1mf.pl 30 Nov 2006 13:04:43 -0000 1.61.2.15 -1022,6 +1022,7 "dll" => $shlib, "shared" => 0, "no-gmp" => 0, + "no-rfc3779" => 0, "no-shared" => 0, "no-zlib" => 0, "no-zlib-dynamic" => 0, . patch -p0 <<' .' Index: openssl/util/mkdef.pl ============================================================ ================ $ cvs diff -u -r1.92.2.4 -r1.92.2.5 mkdef.pl --- openssl/util/mkdef.pl 9 Jun 2006 15:42:21 -0000 1.92.2.4 +++ openssl/util/mkdef.pl 30 Nov 2006 13:04:43 -0000 1.92.2.5 -94,6 +94,8 "FP_API", "STDIO", "SOCK", "KRB5", "DGRAM", # Engines "STATIC_ENGINE", "ENGINE", "HW", "GMP", + # RFC3779 support + "RFC3779", # Deprecated functions "DEPRECATED" ); -113,6 +115,7 my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5; my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; my $no_camellia; my $no_fp_api; my $no_static_engine; my $no_gmp; my $no_deprecated; +my $no_rfc3779; foreach (ARGV, split(/ /, $options)) -189,6 +192,7 elsif (/^no-engine$/) { $no_engine=1; } elsif (/^no-hw$/) { $no_hw=1; } elsif (/^no-gmp$/) { $no_gmp=1; } + elsif (/^no-rfc3779$/) { $no_rfc3779=1; } } -1106,6 +1110,7 if ($keyword eq "FP_API" && $no_fp_api) { return 0; } if ($keyword eq "STATIC_ENGINE" && $no_static_engine) { return 0; } if ($keyword eq "GMP" && $no_gmp) { return 0; } + if ($keyword eq "RFC3779" && $no_rfc3779) { return 0; } if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; } # Nothing recognise as true . patch -p0 <<' .' Index: openssl/util/ssleay.num ============================================================ ================ $ cvs diff -u -r1.44 -r1.44.2.1 ssleay.num --- openssl/util/ssleay.num 9 May 2005 00:22:02 -0000 1.44 +++ openssl/util/ssleay.num 30 Nov 2006 13:04:43 -0000 1.44.2.1 -226,3 +226,15 SSL_COMP_get_compression_methods 276 EXIST:!VMS:FUNCTION:COMP SSL_COMP_get_compress_methods 276 EXIST:VMS:FUNCTION:COMP SSL_SESSION_get_id 277 EXIST::FUNCTION: +SSL_CTX_sess_set_new_cb 278 EXIST::FUNCTION: +SSL_CTX_sess_get_get_cb 279 EXIST::FUNCTION: +SSL_CTX_sess_set_get_cb 280 EXIST::FUNCTION: +SSL_CTX_set_cookie_verify_cb 281 EXIST::FUNCTION: +SSL_CTX_get_info_callback 282 EXIST::FUNCTION: +SSL_CTX_set_cookie_generate_cb 283 EXIST::FUNCTION: +SSL_CTX_set_client_cert_cb 284 EXIST::FUNCTION: +SSL_CTX_sess_set_remove_cb 285 EXIST::FUNCTION: +SSL_CTX_set_info_callback 286 EXIST::FUNCTION: +SSL_CTX_sess_get_new_cb 287 EXIST::FUNCTION: +SSL_CTX_get_client_cert_cb 288 EXIST::FUNCTION: +SSL_CTX_sess_get_remove_cb 289 EXIST::FUNCTION: . ____________________________________________________________ __________ OpenSSL Project http://www.openssl.org CVS Repository Commit List openssl-cvsopenssl.org Automated List Manager majordomoopenssl.org

[1]

about | contact Other archives ( Real Estate discussion Medical topics )