head 1.2; access; symbols perseant-exfatfs-base-20250801:1.2 perseant-exfatfs-base-20240630:1.2 perseant-exfatfs:1.2.0.8 perseant-exfatfs-base:1.2 netbsd-8-3-RELEASE:1.1.1.2 cjep_sun2x:1.2.0.6 cjep_sun2x-base:1.2 cjep_staticlib_x-base1:1.2 cjep_staticlib_x:1.2.0.4 cjep_staticlib_x-base:1.2 phil-wifi-20200421:1.2 phil-wifi-20200411:1.2 phil-wifi-20200406:1.2 netbsd-8-2-RELEASE:1.1.1.2 netbsd-8-1-RELEASE:1.1.1.2 netbsd-8-1-RC1:1.1.1.2 pgoyette-compat-merge-20190127:1.2 pgoyette-compat-20190127:1.2 pgoyette-compat-20190118:1.2 pgoyette-compat-1226:1.2 pgoyette-compat-1126:1.2 pgoyette-compat-1020:1.2 pgoyette-compat-0930:1.2 pgoyette-compat-0906:1.2 netbsd-7-2-RELEASE:1.1.1.2 pgoyette-compat-0728:1.2 netbsd-8-0-RELEASE:1.1.1.2 pgoyette-compat-0625:1.2 netbsd-8-0-RC2:1.1.1.2 pgoyette-compat-0521:1.2 pgoyette-compat-0502:1.2 pgoyette-compat-0422:1.2 netbsd-8-0-RC1:1.1.1.2 pgoyette-compat-0415:1.2 pgoyette-compat-0407:1.2 pgoyette-compat-0330:1.2 pgoyette-compat-0322:1.2 pgoyette-compat-0315:1.2 netbsd-7-1-2-RELEASE:1.1.1.2 pgoyette-compat:1.2.0.2 pgoyette-compat-base:1.2 netbsd-7-1-1-RELEASE:1.1.1.2 matt-nb8-mediatek:1.1.1.2.0.40 matt-nb8-mediatek-base:1.1.1.2 perseant-stdc-iso10646:1.1.1.2.0.38 perseant-stdc-iso10646-base:1.1.1.2 netbsd-8:1.1.1.2.0.36 netbsd-8-base:1.1.1.2 prg-localcount2-base3:1.1.1.2 prg-localcount2-base2:1.1.1.2 prg-localcount2-base1:1.1.1.2 prg-localcount2:1.1.1.2.0.34 prg-localcount2-base:1.1.1.2 pgoyette-localcount-20170426:1.1.1.2 bouyer-socketcan-base1:1.1.1.2 pgoyette-localcount-20170320:1.1.1.2 netbsd-7-1:1.1.1.2.0.32 netbsd-7-1-RELEASE:1.1.1.2 netbsd-7-1-RC2:1.1.1.2 openssl-1-0-2k:1.1.1.2 netbsd-7-nhusb-base-20170116:1.1.1.2 bouyer-socketcan:1.1.1.2.0.30 bouyer-socketcan-base:1.1.1.2 pgoyette-localcount-20170107:1.1.1.2 netbsd-7-1-RC1:1.1.1.2 pgoyette-localcount-20161104:1.1.1.2 netbsd-7-0-2-RELEASE:1.1.1.2 openssl-1-0-2j:1.1.1.2 localcount-20160914:1.1.1.2 netbsd-7-nhusb:1.1.1.2.0.28 netbsd-7-nhusb-base:1.1.1.2 pgoyette-localcount-20160806:1.1.1.2 pgoyette-localcount-20160726:1.1.1.2 pgoyette-localcount:1.1.1.2.0.26 pgoyette-localcount-base:1.1.1.2 netbsd-7-0-1-RELEASE:1.1.1.2 openssl-1-0-1t:1.1.1.2 openssl-1-0-1s:1.1.1.2 openssl-1-0-1r:1.1.1.2 openssl-1-0-1q:1.1.1.2 netbsd-7-0:1.1.1.2.0.24 netbsd-7-0-RELEASE:1.1.1.2 netbsd-7-0-RC3:1.1.1.2 netbsd-7-0-RC2:1.1.1.2 openssl-1-0-1p:1.1.1.2 netbsd-7-0-RC1:1.1.1.2 openssl-1-0-1o:1.1.1.2 openssl-1-0-1n:1.1.1.2 openssl-1-0-1m:1.1.1.2 openssl-1-0-1k:1.1.1.2 netbsd-6-0-6-RELEASE:1.1.1.2 netbsd-6-1-5-RELEASE:1.1.1.2 netbsd-7:1.1.1.2.0.22 netbsd-7-base:1.1.1.2 openssl-1-0-1i:1.1.1.2 openssl-1-0-1h:1.1.1.2 yamt-pagecache-base9:1.1.1.2 yamt-pagecache-tag8:1.1.1.2 netbsd-6-1-4-RELEASE:1.1.1.2 netbsd-6-0-5-RELEASE:1.1.1.2 openssl-1-0-1g:1.1.1.2 tls-earlyentropy:1.1.1.2.0.20 tls-earlyentropy-base:1.1.1.2 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.2 riastradh-drm2-base3:1.1.1.2 netbsd-6-1-3-RELEASE:1.1.1.2 netbsd-6-0-4-RELEASE:1.1.1.2 openssl-1-0-1f:1.1.1.2 netbsd-6-1-2-RELEASE:1.1.1.2 netbsd-6-0-3-RELEASE:1.1.1.2 netbsd-6-1-1-RELEASE:1.1.1.2 riastradh-drm2-base2:1.1.1.2 riastradh-drm2-base1:1.1.1.2 riastradh-drm2:1.1.1.2.0.12 riastradh-drm2-base:1.1.1.2 netbsd-6-1:1.1.1.2.0.18 netbsd-6-0-2-RELEASE:1.1.1.2 netbsd-6-1-RELEASE:1.1.1.2 khorben-n900:1.1.1.2.0.16 netbsd-6-1-RC4:1.1.1.2 netbsd-6-1-RC3:1.1.1.2 agc-symver:1.1.1.2.0.14 agc-symver-base:1.1.1.2 netbsd-6-1-RC2:1.1.1.2 netbsd-6-1-RC1:1.1.1.2 openssl-1-0-1e:1.1.1.2 openssl-1-0-1d:1.1.1.2 yamt-pagecache-base8:1.1.1.2 netbsd-6-0-1-RELEASE:1.1.1.2 yamt-pagecache-base7:1.1.1.2 matt-nb6-plus-nbase:1.1.1.2 yamt-pagecache-base6:1.1.1.2 netbsd-6-0:1.1.1.2.0.10 netbsd-6-0-RELEASE:1.1.1.2 netbsd-6-0-RC2:1.1.1.2 tls-maxphys:1.1.1.2.0.8 tls-maxphys-base:1.1.1.2 matt-nb6-plus:1.1.1.2.0.6 matt-nb6-plus-base:1.1.1.2 netbsd-6-0-RC1:1.1.1.2 openssl-1-0-1c:1.1.1.2 yamt-pagecache-base5:1.1.1.2 yamt-pagecache-base4:1.1.1.2 netbsd-6:1.1.1.2.0.4 netbsd-6-base:1.1.1.2 yamt-pagecache-base3:1.1.1.2 yamt-pagecache-base2:1.1.1.2 yamt-pagecache:1.1.1.2.0.2 yamt-pagecache-base:1.1.1.2 openssl-1-0-1-stable-SNAP-20110605:1.1.1.2 cherry-xenmp:1.1.1.1.0.4 cherry-xenmp-base:1.1.1.1 bouyer-quota2-nbase:1.1.1.1 bouyer-quota2:1.1.1.1.0.2 bouyer-quota2-base:1.1.1.1 matt-mips64-premerge-20101231:1.1.1.1 OPENSSL_SNAP_20091226:1.1.1.1 matt-premerge-20091211:1.1.1.1 OPENSSL_SNAP_20090805:1.1.1.1 OPENSSL_SNAP_20090710:1.1.1.1 OPENSSL:1.1.1; locks; strict; comment @:: @; 1.2 date 2018.02.08.21.51.36; author christos; state dead; branches; next 1.1; commitid ZC7h5KHFDY0lu6qA; 1.1 date 2009.07.19.23.05.37; author christos; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2009.07.19.23.05.37; author christos; state Exp; branches 1.1.1.1.4.1; next 1.1.1.2; 1.1.1.2 date 2011.06.05.15.00.28; author spz; state Exp; branches; next ; 1.1.1.1.4.1 date 2011.06.23.14.18.06; author cherry; state Exp; branches; next ; desc @@ 1.2 log @merged conflicts @ text @rem set ssleay=..\out\ssleay set ssleay=%1 set reqcmd=%ssleay% req set x509cmd=%ssleay% x509 set verifycmd=%ssleay% verify set CAkey=\OpenSSL\keyCA.ss set CAcert=\OpenSSL\certCA.ss set CAserial=\OpenSSL\certCA.srl set CAreq=\OpenSSL\reqCA.ss cecopy ..\test\CAss.cnf CE:\OpenSSL set CAconf=\OpenSSL\CAss.cnf set CAreq2=\OpenSSL\req2CA.ss cecopy ..\test\Uss.cnf CE:\OpenSSL set Uconf=\OpenSSL\Uss.cnf set Ukey=\OpenSSL\keyU.ss set Ureq=\OpenSSL\reqU.ss set Ucert=\OpenSSL\certU.ss echo make a certificate request using 'req' cerun CE:\OpenSSL\%reqcmd% -config %CAconf% -out %CAreq% -keyout %CAkey% -new if errorlevel 1 goto e_req echo convert the certificate request into a self signed certificate using 'x509' cerun CE:\OpenSSL\%x509cmd% -CAcreateserial -in %CAreq% -days 30 -req -out %CAcert% -signkey %CAkey% "> \OpenSSL\err.ss" if errorlevel 1 goto e_x509 echo -- echo convert a certificate into a certificate request using 'x509' cerun CE:\OpenSSL\%x509cmd% -in %CAcert% -x509toreq -signkey %CAkey% -out %CAreq2% "> \OpenSSL\err.ss" if errorlevel 1 goto e_x509_2 cerun CE:\OpenSSL\%reqcmd% -verify -in %CAreq% -noout if errorlevel 1 goto e_vrfy_1 cerun CE:\OpenSSL\%reqcmd% -verify -in %CAreq2% -noout if errorlevel 1 goto e_vrfy_2 cerun CE:\OpenSSL\%verifycmd% -CAfile %CAcert% %CAcert% if errorlevel 1 goto e_vrfy_3 echo -- echo make another certificate request using 'req' cerun CE:\OpenSSL\%reqcmd% -config %Uconf% -out %Ureq% -keyout %Ukey% -new "> \OpenSSL\err.ss" if errorlevel 1 goto e_req_gen echo -- echo sign certificate request with the just created CA via 'x509' cerun CE:\OpenSSL\%x509cmd% -CAcreateserial -in %Ureq% -days 30 -req -out %Ucert% -CA %CAcert% -CAkey %CAkey% -CAserial %CAserial% if errorlevel 1 goto e_x_sign cerun CE:\OpenSSL\%verifycmd% -CAfile %CAcert% %Ucert% echo -- echo Certificate details cerun CE:\OpenSSL\%x509cmd% -subject -issuer -startdate -enddate -noout -in %Ucert% cecopy CE:%CAcert% . cecopy CE:%CAkey% . cecopy CE:%CAserial% . cecopy CE:%Ucert% . cecopy CE:%Ukey% . echo Everything appeared to work echo -- echo The generated CA certificate is %CAcert% echo The generated CA private key is %CAkey% echo The current CA signing serial number is in %CAserial% echo The generated user certificate is %Ucert% echo The generated user private key is %Ukey% echo -- cedel CE:\OpenSSL\err.ss goto end :e_req echo error using 'req' to generate a certificate request goto end :e_x509 echo error using 'x509' to self sign a certificate request goto end :e_x509_2 echo error using 'x509' convert a certificate to a certificate request goto end :e_vrfy_1 echo first generated request is invalid goto end :e_vrfy_2 echo second generated request is invalid goto end :e_vrfy_3 echo first generated cert is invalid goto end :e_req_gen echo error using 'req' to generate a certificate request goto end :e_x_sign echo error using 'x509' to sign a certificate request goto end :end @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @import new openssl snapshot @ text @@ 1.1.1.1.4.1 log @Catchup with rmind-uvmplock merge. @ text @d1 104 a104 104 rem set ssleay=..\out\ssleay set ssleay=%1 set reqcmd=%ssleay% req set x509cmd=%ssleay% x509 set verifycmd=%ssleay% verify set CAkey=\OpenSSL\keyCA.ss set CAcert=\OpenSSL\certCA.ss set CAserial=\OpenSSL\certCA.srl set CAreq=\OpenSSL\reqCA.ss cecopy ..\test\CAss.cnf CE:\OpenSSL set CAconf=\OpenSSL\CAss.cnf set CAreq2=\OpenSSL\req2CA.ss cecopy ..\test\Uss.cnf CE:\OpenSSL set Uconf=\OpenSSL\Uss.cnf set Ukey=\OpenSSL\keyU.ss set Ureq=\OpenSSL\reqU.ss set Ucert=\OpenSSL\certU.ss echo make a certificate request using 'req' cerun CE:\OpenSSL\%reqcmd% -config %CAconf% -out %CAreq% -keyout %CAkey% -new if errorlevel 1 goto e_req echo convert the certificate request into a self signed certificate using 'x509' cerun CE:\OpenSSL\%x509cmd% -CAcreateserial -in %CAreq% -days 30 -req -out %CAcert% -signkey %CAkey% "> \OpenSSL\err.ss" if errorlevel 1 goto e_x509 echo -- echo convert a certificate into a certificate request using 'x509' cerun CE:\OpenSSL\%x509cmd% -in %CAcert% -x509toreq -signkey %CAkey% -out %CAreq2% "> \OpenSSL\err.ss" if errorlevel 1 goto e_x509_2 cerun CE:\OpenSSL\%reqcmd% -verify -in %CAreq% -noout if errorlevel 1 goto e_vrfy_1 cerun CE:\OpenSSL\%reqcmd% -verify -in %CAreq2% -noout if errorlevel 1 goto e_vrfy_2 cerun CE:\OpenSSL\%verifycmd% -CAfile %CAcert% %CAcert% if errorlevel 1 goto e_vrfy_3 echo -- echo make another certificate request using 'req' cerun CE:\OpenSSL\%reqcmd% -config %Uconf% -out %Ureq% -keyout %Ukey% -new "> \OpenSSL\err.ss" if errorlevel 1 goto e_req_gen echo -- echo sign certificate request with the just created CA via 'x509' cerun CE:\OpenSSL\%x509cmd% -CAcreateserial -in %Ureq% -days 30 -req -out %Ucert% -CA %CAcert% -CAkey %CAkey% -CAserial %CAserial% if errorlevel 1 goto e_x_sign cerun CE:\OpenSSL\%verifycmd% -CAfile %CAcert% %Ucert% echo -- echo Certificate details cerun CE:\OpenSSL\%x509cmd% -subject -issuer -startdate -enddate -noout -in %Ucert% cecopy CE:%CAcert% . cecopy CE:%CAkey% . cecopy CE:%CAserial% . cecopy CE:%Ucert% . cecopy CE:%Ukey% . echo Everything appeared to work echo -- echo The generated CA certificate is %CAcert% echo The generated CA private key is %CAkey% echo The current CA signing serial number is in %CAserial% echo The generated user certificate is %Ucert% echo The generated user private key is %Ukey% echo -- cedel CE:\OpenSSL\err.ss goto end :e_req echo error using 'req' to generate a certificate request goto end :e_x509 echo error using 'x509' to self sign a certificate request goto end :e_x509_2 echo error using 'x509' convert a certificate to a certificate request goto end :e_vrfy_1 echo first generated request is invalid goto end :e_vrfy_2 echo second generated request is invalid goto end :e_vrfy_3 echo first generated cert is invalid goto end :e_req_gen echo error using 'req' to generate a certificate request goto end :e_x_sign echo error using 'x509' to sign a certificate request goto end :end @ 1.1.1.2 log @Import OpenSSL 1.0.1 stable of 20110605: this is sort of a sidegrade onto the release branch. Changes against the last version imported: *) Backport libcrypto audit of return value checking from HEAD, not all cases can be covered as some introduce binary incompatibilities. [Steve Henson] *) Redirect RSA operations to FIPS module including keygen, encrypt, decrypt, sign and verify. Block use of non FIPS RSA methods. [Steve Henson] *) Add similar low level API blocking to ciphers. [Steve Henson] *) Low level digest APIs are not approved in FIPS mode: any attempt to use these will cause a fatal error. Applications that *really* want to use them can use the private_* version instead. [Steve Henson] *) Redirect cipher operations to FIPS module for FIPS builds. [Steve Henson] *) Redirect digest operations to FIPS module for FIPS builds. [Steve Henson] *) Update build system to add "fips" flag which will link in fipscanister.o for static and shared library builds embedding a signature if needed. [Steve Henson] *) Output TLS supported curves in preference order instead of numerical order. This is currently hardcoded for the highest order curves first. This should be configurable so applications can judge speed vs strength. [Steve Henson] *) Add protection against ECDSA timing attacks as mentioned in the paper by Billy Bob Brumley and Nicola Tuveri, see: http://eprint.iacr.org/2011/232.pdf [Billy Bob Brumley and Nicola Tuveri] *) Add TLS v1.2 server support for client authentication. [Steve Henson] *) Add support for FIPS mode in ssl library: disable SSLv3, non-FIPS ciphers and enable MD5. [Steve Henson] *) Functions FIPS_mode_set() and FIPS_mode() which call the underlying FIPS modules versions. [Steve Henson] *) Add TLS v1.2 client side support for client authentication. Keep cache of handshake records longer as we don't know the hash algorithm to use until after the certificate request message is received. [Steve Henson] *) Initial TLS v1.2 client support. Add a default signature algorithms extension including all the algorithms we support. Parse new signature format in client key exchange. Relax some ECC signing restrictions for TLS v1.2 as indicated in RFC5246. [Steve Henson] *) Add server support for TLS v1.2 signature algorithms extension. Switch to new signature format when needed using client digest preference. All server ciphersuites should now work correctly in TLS v1.2. No client support yet and no support for client certificates. [Steve Henson] *) Initial TLS v1.2 support. Add new SHA256 digest to ssl code, switch to SHA256 for PRF when using TLS v1.2 and later. Add new SHA256 based ciphersuites. At present only RSA key exchange ciphersuites work with TLS v1.2. Add new option for TLS v1.2 replacing the old and obsolete SSL_OP_PKCS1_CHECK flags with SSL_OP_NO_TLSv1_2. New TLSv1.2 methods and version checking. [Steve Henson] *) New option OPENSSL_NO_SSL_INTERN. If an application can be compiled with this defined it will not be affected by any changes to ssl internal structures. Add several utility functions to allow openssl application to work with OPENSSL_NO_SSL_INTERN defined. [Steve Henson] *) Add SRP support. [Tom Wu and Ben Laurie] *) Add functions to copy EVP_PKEY_METHOD and retrieve flags and id. [Steve Henson] *) Add EC_GFp_nistp224_method(), a 64-bit optimized implementation for elliptic curve NIST-P224 with constant-time single point multiplication on typical inputs. EC_GROUP_new_by_curve_name() will automatically use this (while EC_GROUP_new_curve_GFp() currently won't and prefers the more flexible implementations). The implementation requires support for the nonstandard type __uint128_t, and so is disabled by default. To include this in your build of OpenSSL, use -DEC_NISTP224_64_GCC_128 on the Configure (or config) command line, and run "make depend" (or "make update"). [Emilia Ksper (Google)] *) Permit abbreviated handshakes when renegotiating using the function SSL_renegotiate_abbreviated(). [Robin Seggelmann ] *) Add call to ENGINE_register_all_complete() to ENGINE_load_builtin_engines(), so some implementations get used automatically instead of needing explicit application support. [Steve Henson] *) Add support for TLS key exporter as described in RFC5705. [Robin Seggelmann , Steve Henson] @ text @d1 104 a104 104 rem set ssleay=..\out\ssleay set ssleay=%1 set reqcmd=%ssleay% req set x509cmd=%ssleay% x509 set verifycmd=%ssleay% verify set CAkey=\OpenSSL\keyCA.ss set CAcert=\OpenSSL\certCA.ss set CAserial=\OpenSSL\certCA.srl set CAreq=\OpenSSL\reqCA.ss cecopy ..\test\CAss.cnf CE:\OpenSSL set CAconf=\OpenSSL\CAss.cnf set CAreq2=\OpenSSL\req2CA.ss cecopy ..\test\Uss.cnf CE:\OpenSSL set Uconf=\OpenSSL\Uss.cnf set Ukey=\OpenSSL\keyU.ss set Ureq=\OpenSSL\reqU.ss set Ucert=\OpenSSL\certU.ss echo make a certificate request using 'req' cerun CE:\OpenSSL\%reqcmd% -config %CAconf% -out %CAreq% -keyout %CAkey% -new if errorlevel 1 goto e_req echo convert the certificate request into a self signed certificate using 'x509' cerun CE:\OpenSSL\%x509cmd% -CAcreateserial -in %CAreq% -days 30 -req -out %CAcert% -signkey %CAkey% "> \OpenSSL\err.ss" if errorlevel 1 goto e_x509 echo -- echo convert a certificate into a certificate request using 'x509' cerun CE:\OpenSSL\%x509cmd% -in %CAcert% -x509toreq -signkey %CAkey% -out %CAreq2% "> \OpenSSL\err.ss" if errorlevel 1 goto e_x509_2 cerun CE:\OpenSSL\%reqcmd% -verify -in %CAreq% -noout if errorlevel 1 goto e_vrfy_1 cerun CE:\OpenSSL\%reqcmd% -verify -in %CAreq2% -noout if errorlevel 1 goto e_vrfy_2 cerun CE:\OpenSSL\%verifycmd% -CAfile %CAcert% %CAcert% if errorlevel 1 goto e_vrfy_3 echo -- echo make another certificate request using 'req' cerun CE:\OpenSSL\%reqcmd% -config %Uconf% -out %Ureq% -keyout %Ukey% -new "> \OpenSSL\err.ss" if errorlevel 1 goto e_req_gen echo -- echo sign certificate request with the just created CA via 'x509' cerun CE:\OpenSSL\%x509cmd% -CAcreateserial -in %Ureq% -days 30 -req -out %Ucert% -CA %CAcert% -CAkey %CAkey% -CAserial %CAserial% if errorlevel 1 goto e_x_sign cerun CE:\OpenSSL\%verifycmd% -CAfile %CAcert% %Ucert% echo -- echo Certificate details cerun CE:\OpenSSL\%x509cmd% -subject -issuer -startdate -enddate -noout -in %Ucert% cecopy CE:%CAcert% . cecopy CE:%CAkey% . cecopy CE:%CAserial% . cecopy CE:%Ucert% . cecopy CE:%Ukey% . echo Everything appeared to work echo -- echo The generated CA certificate is %CAcert% echo The generated CA private key is %CAkey% echo The current CA signing serial number is in %CAserial% echo The generated user certificate is %Ucert% echo The generated user private key is %Ukey% echo -- cedel CE:\OpenSSL\err.ss goto end :e_req echo error using 'req' to generate a certificate request goto end :e_x509 echo error using 'x509' to self sign a certificate request goto end :e_x509_2 echo error using 'x509' convert a certificate to a certificate request goto end :e_vrfy_1 echo first generated request is invalid goto end :e_vrfy_2 echo second generated request is invalid goto end :e_vrfy_3 echo first generated cert is invalid goto end :e_req_gen echo error using 'req' to generate a certificate request goto end :e_x_sign echo error using 'x509' to sign a certificate request goto end :end @