sync with OpenBSD -current
This commit is contained in:
parent
8873eac723
commit
02d83d01a6
GPG key ID:
F42C07F07E2E35B7
275 changed files with 1129 additions and 1124 deletions
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
LibReSSL files are retained under the copyright of the authors. New
|
||||
additions are ISC licensed as per OpenBSD's normal licensing policy,
|
||||
or are placed in the public domain.
|
||||
or are placed in the public domain.
|
||||
|
||||
The OpenSSL code is distributed under the terms of the original OpenSSL
|
||||
licenses which follow:
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
|
|
@ -80,21 +80,21 @@
|
|||
* This package is an SSL implementation written
|
||||
* by Eric Young (eay@cryptsoft.com).
|
||||
* The implementation was written so as to conform with Netscapes SSL.
|
||||
*
|
||||
*
|
||||
* This library is free for commercial and non-commercial use as long as
|
||||
* the following conditions are aheared to. The following conditions
|
||||
* apply to all code found in this distribution, be it the RC4, RSA,
|
||||
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
||||
* included with this distribution is covered by the same copyright terms
|
||||
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
*
|
||||
* Copyright remains Eric Young's, and as such any Copyright notices in
|
||||
* the code are not to be removed.
|
||||
* If this package is used in a product, Eric Young should be given attribution
|
||||
* as the author of the parts of the library used.
|
||||
* This can be in the form of a textual message at program startup or
|
||||
* in documentation (online or textual) provided with the package.
|
||||
*
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
|
|
@ -109,10 +109,10 @@
|
|||
* Eric Young (eay@cryptsoft.com)"
|
||||
* The word 'cryptographic' can be left out if the rouines from the library
|
||||
* being used are not cryptographic related :-).
|
||||
* 4. If you include any Windows specific code (or a derivative thereof) from
|
||||
* 4. If you include any Windows specific code (or a derivative thereof) from
|
||||
* the apps directory (application code) you must include an acknowledgement:
|
||||
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
||||
*
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
|
|
@ -124,7 +124,7 @@
|
|||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
*
|
||||
* The licence and distribution terms for any publically available version or
|
||||
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
||||
* copied and put under another distribution licence
|
||||
|
|
|
|||
|
|
@ -559,6 +559,6 @@ int cbs_get_any_asn1_element_internal(CBS *cbs, CBS *out, unsigned int *out_tag,
|
|||
int CBS_asn1_indefinite_to_definite(CBS *in, uint8_t **out, size_t *out_len);
|
||||
#endif /* LIBRESSL_INTERNAL */
|
||||
|
||||
__END_HIDDEN_DECLS
|
||||
__END_HIDDEN_DECLS
|
||||
|
||||
#endif /* OPENSSL_HEADER_BYTESTRING_H */
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
#ifndef HEADER_PQUEUE_H
|
||||
#define HEADER_PQUEUE_H
|
||||
|
||||
__BEGIN_HIDDEN_DECLS
|
||||
__BEGIN_HIDDEN_DECLS
|
||||
|
||||
typedef struct _pqueue *pqueue;
|
||||
|
||||
|
|
@ -88,6 +88,6 @@ pitem *pqueue_next(piterator *iter);
|
|||
|
||||
int pqueue_size(pqueue pq);
|
||||
|
||||
__END_HIDDEN_DECLS
|
||||
__END_HIDDEN_DECLS
|
||||
|
||||
#endif /* ! HEADER_PQUEUE_H */
|
||||
|
|
|
|||
|
|
@ -1778,7 +1778,7 @@ ssl3_get_server_done(SSL *s)
|
|||
int ret;
|
||||
|
||||
if ((ret = ssl3_get_message(s, SSL3_ST_CR_SRVR_DONE_A,
|
||||
SSL3_ST_CR_SRVR_DONE_B, SSL3_MT_SERVER_DONE,
|
||||
SSL3_ST_CR_SRVR_DONE_B, SSL3_MT_SERVER_DONE,
|
||||
30 /* should be very small, like 0 :-) */)) <= 0)
|
||||
return ret;
|
||||
|
||||
|
|
|
|||
|
|
@ -383,11 +383,11 @@ sub run_smime_tests {
|
|||
my ( $tnam, $rscmd, $rvcmd ) = @$smtst;
|
||||
if ($ossl8)
|
||||
{
|
||||
# Skip smime resign: 0.9.8 smime doesn't support -resign
|
||||
# Skip smime resign: 0.9.8 smime doesn't support -resign
|
||||
next if ($scmd =~ /smime/ && $rscmd =~ /-resign/);
|
||||
# Disable streaming: option not supported in 0.9.8
|
||||
$tnam =~ s/streaming//;
|
||||
$rscmd =~ s/-stream//;
|
||||
$tnam =~ s/streaming//;
|
||||
$rscmd =~ s/-stream//;
|
||||
$rvcmd =~ s/-stream//;
|
||||
}
|
||||
system("$scmd$rscmd$redir");
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
# OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
# ====================================================================
|
||||
|
||||
# Perl utility to run PKITS tests for RFC3280 compliance.
|
||||
# Perl utility to run PKITS tests for RFC3280 compliance.
|
||||
|
||||
my $ossl_path;
|
||||
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ localityName = Locality Name (eg, city)
|
|||
localityName_value = Brisbane
|
||||
|
||||
organizationName = Organization Name (eg, company)
|
||||
organizationName_default =
|
||||
organizationName_default =
|
||||
organizationName_value = CryptSoft Pty Ltd
|
||||
|
||||
organizationalUnitName = Organizational Unit Name (eg, section)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ if $PROG engine aesni | grep -v no-aesni; then
|
|||
nerr=`expr $nerr + 1`
|
||||
fi
|
||||
done
|
||||
for bufsize in $BUFSIZE; do
|
||||
for bufsize in $BUFSIZE; do
|
||||
TEST=`( cat $PROG | \
|
||||
$PROG enc -e -k "$HASH" -$alg | \
|
||||
$PROG enc -d -k "$HASH" -$alg -bufsize $bufsize -engine aesni | \
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ create_ca () {
|
|||
|
||||
echo "Creating a new CA for the TSA tests..."
|
||||
TSDNSECT=ts_ca_dn
|
||||
export TSDNSECT
|
||||
export TSDNSECT
|
||||
../../util/shlib_wrap.sh ../../apps/openssl req -new -x509 -nodes \
|
||||
-out tsaca.pem -keyout tsacakey.pem
|
||||
test $? != 0 && error
|
||||
|
|
@ -56,7 +56,7 @@ create_tsa_cert () {
|
|||
export INDEX
|
||||
EXT=$2
|
||||
TSDNSECT=ts_cert_dn
|
||||
export TSDNSECT
|
||||
export TSDNSECT
|
||||
|
||||
../../util/shlib_wrap.sh ../../apps/openssl req -new \
|
||||
-out tsa_req${INDEX}.pem -keyout tsa_key${INDEX}.pem
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ The general cipher performance number for this platform are
|
|||
SSLeay 0.8.2a 04-Sep-1997
|
||||
built on Fri Sep 5 17:37:05 EST 1997
|
||||
options:bn(64,32) md2(int) rc4(idx,int) des(ptr,risc1,16,long) idea(int) blowfish(ptr2)
|
||||
C flags:gcc -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized
|
||||
C flags:gcc -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized
|
||||
The 'numbers' are in 1000s of bytes per second processed.
|
||||
type 8 bytes 64 bytes 256 bytes 1024 bytes 8192 bytes
|
||||
md2 131.02k 368.41k 500.57k 549.21k 566.09k
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue