Browse Source

Identify and move OpenSSL internal header files

There are header files in crypto/ that are used by the rest of
OpenSSL.  Move those to include/internal and adapt the affected source
code, Makefiles and scripts.

The header files that got moved are:

crypto/constant_time_locl.h
crypto/o_dir.h
crypto/o_str.h

Reviewed-by: Matt Caswell <matt@openssl.org>
master
Richard Levitte 7 years ago
parent
commit
6857079791
17 changed files with 16 additions and 17 deletions
  1. +1
    -2
      crypto/Makefile
  2. +1
    -1
      crypto/o_dir.c
  3. +1
    -1
      crypto/o_dir_test.c
  4. +1
    -1
      crypto/o_str.c
  5. +1
    -1
      crypto/rsa/rsa_oaep.c
  6. +1
    -1
      crypto/rsa/rsa_pk1.c
  7. +2
    -2
      e_os.h
  8. +0
    -0
      include/internal/constant_time_locl.h
  9. +0
    -0
      include/internal/o_dir.h
  10. +0
    -0
      include/internal/o_str.h
  11. +1
    -1
      ssl/Makefile
  12. +1
    -1
      ssl/record/ssl3_record.c
  13. +1
    -1
      ssl/s3_cbc.c
  14. +1
    -1
      ssl/s3_srvr.c
  15. +1
    -1
      ssl/ssl_cert.c
  16. +1
    -1
      test/constant_time_test.c
  17. +2
    -2
      util/mkdef.pl

+ 1
- 2
crypto/Makefile View File

@ -43,8 +43,7 @@ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o \
SRC= $(LIBSRC)
HEADER= cryptlib.h buildinf.h md32_common.h o_str.h o_dir.h \
constant_time_locl.h
HEADER= cryptlib.h buildinf.h md32_common.h
ALL= $(GENERAL) $(SRC) $(HEADER)


+ 1
- 1
crypto/o_dir.c View File

@ -70,7 +70,7 @@
#define LP_find_file OPENSSL_DIR_read
#define LP_find_file_end OPENSSL_DIR_end
#include "o_dir.h"
#include "internal/o_dir.h"
#define LPDIR_H
#if defined OPENSSL_SYS_UNIX || defined DJGPP


+ 1
- 1
crypto/o_dir_test.c View File

@ -36,7 +36,7 @@
#include <stdio.h>
#include <errno.h>
#include "e_os2.h"
#include "o_dir.h"
#include "internal/o_dir.h"
#if defined OPENSSL_SYS_UNIX || defined OPENSSL_SYS_WIN32 || defined OPENSSL_SYS_WINCE
# define CURRDIR "."


+ 1
- 1
crypto/o_str.c View File

@ -59,7 +59,7 @@
#include <ctype.h>
#include <e_os.h>
#include "o_str.h"
#include "internal/o_str.h"
#if !defined(OPENSSL_IMPLEMENTS_strncasecmp) && \
!defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_WINCE) && \


+ 1
- 1
crypto/rsa/rsa_oaep.c View File

@ -17,7 +17,7 @@
* one-wayness. For the RSA function, this is an equivalent notion.
*/
#include "constant_time_locl.h"
#include "internal/constant_time_locl.h"
#include <stdio.h>
#include "cryptlib.h"


+ 1
- 1
crypto/rsa/rsa_pk1.c View File

@ -56,7 +56,7 @@
* [including the GNU Public Licence.]
*/
#include "constant_time_locl.h"
#include "internal/constant_time_locl.h"
#include <stdio.h>
#include "cryptlib.h"


+ 2
- 2
e_os.h View File

@ -605,7 +605,7 @@ extern int sys_nerr;
# define strerror(errnum) \
(((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum])
/* Being signed SunOS 4.x memcpy breaks ASN1_OBJECT table lookup */
# include "crypto/o_str.h"
# include "internal/o_str.h"
# define memcmp OPENSSL_memcmp
# endif
@ -624,7 +624,7 @@ extern int sys_nerr;
# define strncasecmp _strnicmp
# elif defined(OPENSSL_SYS_VMS)
/* VMS below version 7.0 doesn't have strcasecmp() */
# include "o_str.h"
# include "internal/o_str.h"
# define strcasecmp OPENSSL_strcasecmp
# define strncasecmp OPENSSL_strncasecmp
# define OPENSSL_IMPLEMENTS_strncasecmp


crypto/constant_time_locl.h → include/internal/constant_time_locl.h View File


crypto/o_dir.h → include/internal/o_dir.h View File


crypto/o_str.h → include/internal/o_str.h View File


+ 1
- 1
ssl/Makefile View File

@ -5,7 +5,7 @@
DIR= ssl
TOP= ..
CC= cc
INCLUDES= -I../crypto -I$(TOP) -I../include
INCLUDES= -I$(TOP) -I../include
CFLAG=-g
MAKEFILE= Makefile
AR= ar r


+ 1
- 1
ssl/record/ssl3_record.c View File

@ -110,7 +110,7 @@
*/
#include "../ssl_locl.h"
#include "../../crypto/constant_time_locl.h"
#include "internal/constant_time_locl.h"
#include <openssl/rand.h>
#include "record_locl.h"


+ 1
- 1
ssl/s3_cbc.c View File

@ -53,7 +53,7 @@
*
*/
#include "../crypto/constant_time_locl.h"
#include "internal/constant_time_locl.h"
#include "ssl_locl.h"
#include <openssl/md5.h>


+ 1
- 1
ssl/s3_srvr.c View File

@ -151,7 +151,7 @@
#include <stdio.h>
#include "ssl_locl.h"
#include "../crypto/constant_time_locl.h"
#include "internal/constant_time_locl.h"
#include <openssl/buffer.h>
#include <openssl/rand.h>
#include <openssl/objects.h>


+ 1
- 1
ssl/ssl_cert.c View File

@ -123,7 +123,7 @@
# include <sys/types.h>
#endif
#include "o_dir.h"
#include "internal/o_dir.h"
#include <openssl/objects.h>
#include <openssl/bio.h>
#include <openssl/pem.h>


+ 1
- 1
test/constant_time_test.c View File

@ -44,7 +44,7 @@
* [including the GNU Public Licence.]
*/
#include "../crypto/constant_time_locl.h"
#include "internal/constant_time_locl.h"
#include <limits.h>
#include <stdio.h>


+ 2
- 2
util/mkdef.pl View File

@ -262,8 +262,8 @@ $ssl.=" include/openssl/srtp.h";
my $crypto ="include/openssl/crypto.h";
$crypto.=" crypto/cryptlib.h";
$crypto.=" crypto/o_dir.h";
$crypto.=" crypto/o_str.h";
$crypto.=" include/internal/o_dir.h";
$crypto.=" include/internal/o_str.h";
$crypto.=" include/openssl/des.h" ; # unless $no_des;
$crypto.=" include/openssl/idea.h" ; # unless $no_idea;
$crypto.=" include/openssl/rc4.h" ; # unless $no_rc4;


Loading…
Cancel
Save