mirror of
https://github.com/openssl/openssl.git
synced 2024-12-09 05:51:54 +08:00
7b63c0fa8c
des_old.h redefines crypt:
#define crypt(b,s)\
DES_crypt((b),(s))
This scheme leads to failure, if header files with the OS's true definition
of crypt() are processed _after_ des_old.h was processed. This is e.g. the
case on HP-UX with unistd.h.
As evp.h now again includes des.h (which includes des_old.h), this problem
only came up after this modification.
Solution: move header files (indirectly) including e_os.h before the header
files (indirectly) including evp.h.
Submitted by:
Reviewed by:
PR:
118 lines
4.1 KiB
C
118 lines
4.1 KiB
C
/* ssl/s23_pkt.c */
|
|
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
|
* All rights reserved.
|
|
*
|
|
* 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:
|
|
* 1. Redistributions of source code must retain the copyright
|
|
* 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 the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* "This product includes cryptographic software written by
|
|
* 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
|
|
* 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
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* 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
|
|
* [including the GNU Public Licence.]
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <errno.h>
|
|
#define USE_SOCKETS
|
|
#include "ssl_locl.h"
|
|
#include <openssl/evp.h>
|
|
#include <openssl/buffer.h>
|
|
|
|
int ssl23_write_bytes(SSL *s)
|
|
{
|
|
int i,num,tot;
|
|
char *buf;
|
|
|
|
buf=s->init_buf->data;
|
|
tot=s->init_off;
|
|
num=s->init_num;
|
|
for (;;)
|
|
{
|
|
s->rwstate=SSL_WRITING;
|
|
i=BIO_write(s->wbio,&(buf[tot]),num);
|
|
if (i <= 0)
|
|
{
|
|
s->init_off=tot;
|
|
s->init_num=num;
|
|
return(i);
|
|
}
|
|
s->rwstate=SSL_NOTHING;
|
|
if (i == num) return(tot+i);
|
|
|
|
num-=i;
|
|
tot+=i;
|
|
}
|
|
}
|
|
|
|
/* return regularly only when we have read (at least) 'n' bytes */
|
|
int ssl23_read_bytes(SSL *s, int n)
|
|
{
|
|
unsigned char *p;
|
|
int j;
|
|
|
|
if (s->packet_length < (unsigned int)n)
|
|
{
|
|
p=s->packet;
|
|
|
|
for (;;)
|
|
{
|
|
s->rwstate=SSL_READING;
|
|
j=BIO_read(s->rbio,(char *)&(p[s->packet_length]),
|
|
n-s->packet_length);
|
|
if (j <= 0)
|
|
return(j);
|
|
s->rwstate=SSL_NOTHING;
|
|
s->packet_length+=j;
|
|
if (s->packet_length >= (unsigned int)n)
|
|
return(s->packet_length);
|
|
}
|
|
}
|
|
return(n);
|
|
}
|
|
|