Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
vlajos authored and benlaurie committed Sep 5, 2013
1 parent d2625fd commit 478b50c
Show file tree
Hide file tree
Showing 77 changed files with 136 additions and 136 deletions.
8 changes: 4 additions & 4 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -1402,7 +1402,7 @@

*) New option -sigopt to dgst utility. Update dgst to use
EVP_Digest{Sign,Verify}*. These two changes make it possible to use
alternative signing paramaters such as X9.31 or PSS in the dgst
alternative signing parameters such as X9.31 or PSS in the dgst
utility.
[Steve Henson]

Expand Down Expand Up @@ -6448,7 +6448,7 @@ des-cbc 3624.96k 5258.21k 5530.91k 5624.30k 5628.26k

*) Fix ssl/s3_enc.c, ssl/t1_enc.c and ssl/s3_pkt.c so that we don't
reveal whether illegal block cipher padding was found or a MAC
verification error occured. (Neither SSLerr() codes nor alerts
verification error occurred. (Neither SSLerr() codes nor alerts
are directly visible to potential attackers, but the information
may leak via logfiles.)

Expand Down Expand Up @@ -8855,7 +8855,7 @@ des-cbc 3624.96k 5258.21k 5530.91k 5624.30k 5628.26k
*) Bugfix: ssl23_get_client_hello did not work properly when called in
state SSL23_ST_SR_CLNT_HELLO_B, i.e. when the first 7 bytes of
a SSLv2-compatible client hello for SSLv3 or TLSv1 could be read,
but a retry condition occured while trying to read the rest.
but a retry condition occurred while trying to read the rest.
[Bodo Moeller]

*) The PKCS7_ENC_CONTENT_new() function was setting the content type as
Expand Down Expand Up @@ -9780,7 +9780,7 @@ des-cbc 3624.96k 5258.21k 5530.91k 5624.30k 5628.26k
other platforms details on the command line without having to patch the
Configure script everytime: One now can use ``perl Configure
<id>:<details>'', i.e. platform ids are allowed to have details appended
to them (seperated by colons). This is treated as there would be a static
to them (separated by colons). This is treated as there would be a static
pre-configured entry in Configure's %table under key <id> with value
<details> and ``perl Configure <id>'' is called. So, when you want to
perform a quick test-compile under FreeBSD 3.1 with pgcc and without
Expand Down
4 changes: 2 additions & 2 deletions CHANGES.SSLeay
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ eric (about to go bushwalking for the 4 day easter break :-)
7-Jan-98
- Finally reworked the cipher string to ciphers again, so it
works correctly
- All the app_data stuff is now ex_data with funcion calls to access.
- All the app_data stuff is now ex_data with function calls to access.
The index is supplied by a function and 'methods' can be setup
for the types that are called on XXX_new/XXX_free. This lets
applications get notified on creation and destruction. Some of
Expand Down Expand Up @@ -937,7 +937,7 @@ Reasons to start playing with version 0.5.0
certificate, it is my aim to use perl5/Tk but I don't have time to do
this right now. It will generate the certificates but the management
scripts still need to be written. This is not a hard task.
- Things have been cleaned up alot.
- Things have been cleaned up a lot.
- Have a look at the enc and dgst programs in the apps directory.
- It supports v3 of x509 certiticates.

Expand Down
2 changes: 1 addition & 1 deletion Configure
Original file line number Diff line number Diff line change
Expand Up @@ -1590,7 +1590,7 @@ if ($aes_obj =~ /\.o$/)
# aes-ctr.o is not a real file, only indication that assembler
# module implements AES_ctr32_encrypt...
$cflags.=" -DAES_CTR_ASM" if ($aes_obj =~ s/\s*aes\-ctr\.o//);
# aes-xts.o indicates presense of AES_xts_[en|de]crypt...
# aes-xts.o indicates presence of AES_xts_[en|de]crypt...
$cflags.=" -DAES_XTS_ASM" if ($aes_obj =~ s/\s*aes\-xts\.o//);
$aes_obj =~ s/\s*(vpaes|aesni)\-x86\.o//g if ($no_sse2);
$aes_obj =~ s/\s*(vp|bs)aes-\w*\.o//g if ($fipscanisterinternal eq "y");
Expand Down
2 changes: 1 addition & 1 deletion FAQ
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ working across wider range of *BSD branches, not just OpenBSD.
If the test program in question fails withs SIGILL, Illegal Instruction
exception, then you more than likely to run SSE2-capable CPU, such as
Intel P4, under control of kernel which does not support SSE2
instruction extentions. See accompanying INSTALL file and
instruction extensions. See accompanying INSTALL file and
OPENSSL_ia32cap(3) documentation page for further information.

* Why does compiler fail to compile sha512.c?
Expand Down
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
compiler flags for any other CPU specific configuration,
e.g. "-m32" to build x86 code on an x64 system.

no-sse2 Exclude SSE2 code pathes. Normally SSE2 extention is
no-sse2 Exclude SSE2 code pathes. Normally SSE2 extension is
detected at run-time, but the decision whether or not the
machine code will be executed is taken solely on CPU
capability vector. This means that if you happen to run OS
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.NW
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ The openssl program has numerous options and can be used for many different
things. Many of the options operate in an interactive mode requiring the
user to enter data. Because of this, a default screen is created for the
program. However, when running the test script it is not desirable to
have a seperate screen. Therefore, the build also creates openssl2.nlm.
have a separate screen. Therefore, the build also creates openssl2.nlm.
Openssl2.nlm is functionally identical but uses the console screen.
Openssl2 can be used when a non-interactive mode is desired.

Expand Down
2 changes: 1 addition & 1 deletion Netware/globals.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ static LHASH *error_hash=NULL;
static LHASH *thread_hash=NULL;

several files have routines with static "init" to track if error strings
have been loaded ( may not want seperate error strings for each process )
have been loaded ( may not want separate error strings for each process )
The "init" variable can't be left "global" because the error has is a ptr
that is malloc'ed. The malloc'ed error has is dependant on the "init"
vars.
Expand Down
6 changes: 3 additions & 3 deletions apps/ca.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
static const char *ca_usage[]={
"usage: ca args\n",
"\n",
" -verbose - Talk alot while doing things\n",
" -verbose - Talk a lot while doing things\n",
" -config file - A config file\n",
" -name arg - The particular CA definition to use\n",
" -gencrl - Generate a new CRL\n",
Expand Down Expand Up @@ -179,7 +179,7 @@ static const char *ca_usage[]={
" -utf8 - input characters are UTF8 (default ASCII)\n",
" -multivalue-rdn - enable support for multivalued RDNs\n",
" -extensions .. - Extension section (override value in config file)\n",
" -extfile file - Configuration file with X509v3 extentions to add\n",
" -extfile file - Configuration file with X509v3 extensions to add\n",
" -crlexts .. - CRL extension section (override value in config file)\n",
#ifndef OPENSSL_NO_ENGINE
" -engine e - use engine e, possibly a hardware device.\n",
Expand Down Expand Up @@ -994,7 +994,7 @@ EF_ALIGNMENT=0;
}

/*****************************************************************/
/* Read extentions config file */
/* Read extensions config file */
if (extfile)
{
extconf = NCONF_new(NULL);
Expand Down
4 changes: 2 additions & 2 deletions apps/openssl-vms.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ crl = $dir]crl.pem # The current CRL
private_key = $dir.private]cakey.pem# The private key
RANDFILE = $dir.private].rand # private random number file

x509_extensions = usr_cert # The extentions to add to the cert
x509_extensions = usr_cert # The extensions to add to the cert

# Comment out the following two lines for the "traditional"
# (and highly broken) format.
Expand Down Expand Up @@ -107,7 +107,7 @@ default_bits = 1024
default_keyfile = privkey.pem
distinguished_name = req_distinguished_name
attributes = req_attributes
x509_extensions = v3_ca # The extentions to add to the self signed cert
x509_extensions = v3_ca # The extensions to add to the self signed cert

# Passwords for private keys if not present they will be prompted for
# input_password = secret
Expand Down
4 changes: 2 additions & 2 deletions apps/openssl.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ crl = $dir/crl.pem # The current CRL
private_key = $dir/private/cakey.pem# The private key
RANDFILE = $dir/private/.rand # private random number file

x509_extensions = usr_cert # The extentions to add to the cert
x509_extensions = usr_cert # The extensions to add to the cert

# Comment out the following two lines for the "traditional"
# (and highly broken) format.
Expand Down Expand Up @@ -107,7 +107,7 @@ default_bits = 1024
default_keyfile = privkey.pem
distinguished_name = req_distinguished_name
attributes = req_attributes
x509_extensions = v3_ca # The extentions to add to the self signed cert
x509_extensions = v3_ca # The extensions to add to the self signed cert

# Passwords for private keys if not present they will be prompted for
# input_password = secret
Expand Down
2 changes: 1 addition & 1 deletion apps/s_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -1866,7 +1866,7 @@ SSL_set_tlsext_status_ids(con, ids);

if ((SSL_version(con) == DTLS1_VERSION) && DTLSv1_handle_timeout(con) > 0)
{
BIO_printf(bio_err,"TIMEOUT occured\n");
BIO_printf(bio_err,"TIMEOUT occurred\n");
}

if (!ssl_pending && FD_ISSET(SSL_get_fd(con),&writefds))
Expand Down
2 changes: 1 addition & 1 deletion apps/s_server.c
Original file line number Diff line number Diff line change
Expand Up @@ -2359,7 +2359,7 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context)

if ((SSL_version(con) == DTLS1_VERSION) && DTLSv1_handle_timeout(con) > 0)
{
BIO_printf(bio_err,"TIMEOUT occured\n");
BIO_printf(bio_err,"TIMEOUT occurred\n");
}

if (i <= 0) continue;
Expand Down
2 changes: 1 addition & 1 deletion apps/srp.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
static char *srp_usage[]={
"usage: srp [args] [user] \n",
"\n",
" -verbose Talk alot while doing things\n",
" -verbose Talk a lot while doing things\n",
" -config file A config file\n",
" -name arg The particular srp definition to use\n",
" -srpvfile arg The srp verifier file name\n",
Expand Down
4 changes: 2 additions & 2 deletions bugs/sslref.dif
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ is returned as 1.
=====
I have not tested the following but it is reported by holtzman@mit.edu.

SSLref clients wait to recieve a server-verify before they send a
SSLref clients wait to receive a server-verify before they send a
client-finished. Besides this not being evident from the examples in
2.2.1, it makes more sense to always send all packets you can before
reading. SSLeay was waiting in the server to recieve a client-finish
reading. SSLeay was waiting in the server to receive a client-finish
before sending the server-verify :-). I have changed SSLeay to send a
server-verify before trying to read the client-finished.

4 changes: 2 additions & 2 deletions config
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ esac
#

# Do the Apollo stuff first. Here, we just simply assume
# that the existance of the /usr/apollo directory is proof
# that the existence of the /usr/apollo directory is proof
# enough
if [ -d /usr/apollo ]; then
echo "whatever-apollo-whatever"
Expand Down Expand Up @@ -862,7 +862,7 @@ case "$GUESSOS" in
*) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
esac

# NB: This atalla support has been superceded by the ENGINE support
# NB: This atalla support has been superseded by the ENGINE support
# That contains its own header and definitions anyway. Support can
# be enabled or disabled on any supported platform without external
# headers, eg. by adding the "hw-atalla" switch to ./config or
Expand Down
2 changes: 1 addition & 1 deletion crypto/asn1/tasn_utl.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ int asn1_set_choice_selector(ASN1_VALUE **pval, int value, const ASN1_ITEM *it)
/* Do reference counting. The value 'op' decides what to do.
* if it is +1 then the count is incremented. If op is 0 count is
* set to 1. If op is -1 count is decremented and the return value
* is the current refrence count or 0 if no reference count exists.
* is the current reference count or 0 if no reference count exists.
*/

int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it)
Expand Down
2 changes: 1 addition & 1 deletion crypto/bn/asm/README
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ a 2 times speedup :-).

There are 3 versions of assember for the HP PA-RISC.

pa-risc.s is the origional one which works fine and generated using gcc :-)
pa-risc.s is the original one which works fine and generated using gcc :-)

pa-risc2W.s and pa-risc2.s are 64 and 32-bit PA-RISC 2.0 implementations
by Chris Ruemmler from HP (with some help from the HP C compiler).
Expand Down
2 changes: 1 addition & 1 deletion crypto/bn/asm/sparcv8plus.S
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
*
* Q. 64-bit registers under 32-bit kernels? Didn't you just say it
* doesn't work?
* A. You can't adress *all* registers as 64-bit wide:-( The catch is
* A. You can't address *all* registers as 64-bit wide:-( The catch is
* that you actually may rely upon %o0-%o5 and %g1-%g4 being fully
* preserved if you're in a leaf function, i.e. such never calling
* any other functions. All functions in this module are leaf and
Expand Down
2 changes: 1 addition & 1 deletion crypto/bn/asm/sparcv9a-mont.pl
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 +867,7 @@
$code =~ s/\`([^\`]*)\`/eval($1)/gem;

# Below substitution makes it possible to compile without demanding
# VIS extentions on command line, e.g. -xarch=v9 vs. -xarch=v9a. I
# VIS extensions on command line, e.g. -xarch=v9 vs. -xarch=v9a. I
# dare to do this, because VIS capability is detected at run-time now
# and this routine is not called on CPU not capable to execute it. Do
# note that fzeros is not the only VIS dependency! Another dependency
Expand Down
2 changes: 1 addition & 1 deletion crypto/bn/asm/vis3-mont.pl
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@

# Purpose of these subroutines is to explicitly encode VIS instructions,
# so that one can compile the module without having to specify VIS
# extentions on compiler command line, e.g. -xarch=v9 vs. -xarch=v9a.
# extensions on compiler command line, e.g. -xarch=v9 vs. -xarch=v9a.
# Idea is to reserve for option to produce "universal" binary and let
# programmer detect if current CPU is VIS capable at run-time.
sub unvis3 {
Expand Down
2 changes: 1 addition & 1 deletion crypto/bn/todo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Cache RECP_CTX values
make the result argument independant of the inputs.
make the result argument independent of the inputs.
split up the _exp_ functions
2 changes: 1 addition & 1 deletion crypto/des/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Version 3.26
Thanks to Jens Kupferschmidt <bt1cu@hpboot.rz.uni-leipzig.de>. */

SIGWINCH case put in des_read_passwd() so the function does not
'exit' if this function is recieved.
'exit' if this function is received.

Version 3.25 17/07/96
Modified read_pwd.c so that stdin can be read if not a tty.
Expand Down
4 changes: 2 additions & 2 deletions crypto/des/asm/des_enc.m4
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ define(ip_macro, {
! other half (use).
!
! In this version we do two rounds in a loop repeated 7 times
! and two rounds seperately.
! and two rounds separately.
!
! One half has the bits for the sboxes in the following positions:
!
Expand Down Expand Up @@ -1542,7 +1542,7 @@ DES_ncbc_encrypt:
xor global4, local1, out5 ! iv xor next block

ba .ncbc.enc.next.block_2
add in1, 8, in1 ! output adress
add in1, 8, in1 ! output address

.ncbc.enc.next.block_fp:

Expand Down
2 changes: 1 addition & 1 deletion crypto/des/makefile.bc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Origional BC Makefile from Teun <Teun.Nijssen@kub.nl>
# Original BC Makefile from Teun <Teun.Nijssen@kub.nl>
#
#
CC = bcc
Expand Down
2 changes: 1 addition & 1 deletion crypto/dh/dh_ameth.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)


/* PKCS#8 DH is defined in PKCS#11 of all places. It is similar to DH in
* that the AlgorithmIdentifier contains the paramaters, the private key
* that the AlgorithmIdentifier contains the parameters, the private key
* is explcitly included and the pubkey must be recalculated.
*/

Expand Down
2 changes: 1 addition & 1 deletion crypto/dsa/fips186a.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
The origional FIPE 180 used SHA-0 (FIPS 180) for its appendix 5
The original FIPE 180 used SHA-0 (FIPS 180) for its appendix 5
examples. This is an updated version that uses SHA-1 (FIPS 180-1)
supplied to me by Wei Dai
--
Expand Down
8 changes: 4 additions & 4 deletions crypto/dso/dso.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,14 @@ typedef struct dso_st DSO;

/* The function prototype used for method functions (or caller-provided
* callbacks) that transform filenames. They are passed a DSO structure pointer
* (or NULL if they are to be used independantly of a DSO object) and a
* (or NULL if they are to be used independently of a DSO object) and a
* filename to transform. They should either return NULL (if there is an error
* condition) or a newly allocated string containing the transformed form that
* the caller will need to free with OPENSSL_free() when done. */
typedef char* (*DSO_NAME_CONVERTER_FUNC)(DSO *, const char *);
/* The function prototype used for method functions (or caller-provided
* callbacks) that merge two file specifications. They are passed a
* DSO structure pointer (or NULL if they are to be used independantly of
* DSO structure pointer (or NULL if they are to be used independently of
* a DSO object) and two file specifications to merge. They should
* either return NULL (if there is an error condition) or a newly allocated
* string containing the result of merging that the caller will need
Expand Down Expand Up @@ -202,7 +202,7 @@ struct dso_st
* be used in DSO_load() in place of meth->dso_merger. NB: This
* should normally set using DSO_set_merger(). */
DSO_MERGER_FUNC merger;
/* This is populated with (a copy of) the platform-independant
/* This is populated with (a copy of) the platform-independent
* filename used for this DSO. */
char *filename;
/* This is populated with (a copy of) the translated filename by which
Expand Down Expand Up @@ -231,7 +231,7 @@ long DSO_ctrl(DSO *dso, int cmd, long larg, void *parg);
* replaced. Return value is non-zero for success. */
int DSO_set_name_converter(DSO *dso, DSO_NAME_CONVERTER_FUNC cb,
DSO_NAME_CONVERTER_FUNC *oldcb);
/* These functions can be used to get/set the platform-independant filename
/* These functions can be used to get/set the platform-independent filename
* used for a DSO. NB: set will fail if the DSO is already loaded. */
const char *DSO_get_filename(DSO *dso);
int DSO_set_filename(DSO *dso, const char *filename);
Expand Down
4 changes: 2 additions & 2 deletions crypto/dso/dso_dl.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ static int dl_load(DSO *dso)
shl_t ptr = NULL;
/* We don't do any fancy retries or anything, just take the method's
* (or DSO's if it has the callback set) best translation of the
* platform-independant filename and try once with that. */
* platform-independent filename and try once with that. */
char *filename= DSO_convert_filename(dso, NULL);

if(filename == NULL)
Expand Down Expand Up @@ -315,7 +315,7 @@ static char *dl_merger(DSO *dso, const char *filespec1, const char *filespec2)
* unlikely that both the "dl" *and* "dlfcn" variants are being compiled at the
* same time, there's no great duplicating the code. Figuring out an elegant
* way to share one copy of the code would be more difficult and would not
* leave the implementations independant. */
* leave the implementations independent. */
#if defined(__hpux)
static const char extension[] = ".sl";
#else
Expand Down

0 comments on commit 478b50c

Please sign in to comment.