Browse Source

Change #include filenames from <foo.h> to <openssl.h>.

Submitted by:
Reviewed by:
PR:
master
Bodo Möller 24 years ago
parent
commit
ec577822f9
552 changed files with 1605 additions and 1564 deletions
  1. +25
    -0
      Configure
  2. +3
    -1
      Makefile.org
  3. +5
    -5
      apps/apps.h
  4. +4
    -4
      apps/asn1pars.c
  5. +10
    -10
      apps/ca.c
  6. +2
    -2
      apps/ciphers.c
  7. +5
    -5
      apps/crl.c
  8. +6
    -6
      apps/crl2p7.c
  9. +6
    -6
      apps/dgst.c
  10. +6
    -6
      apps/dh.c
  11. +6
    -6
      apps/dsa.c
  12. +7
    -7
      apps/dsaparam.c
  13. +15
    -15
      apps/eay.c
  14. +7
    -7
      apps/enc.c
  15. +4
    -4
      apps/errstr.c
  16. +7
    -7
      apps/gendh.c
  17. +7
    -7
      apps/gendsa.c
  18. +8
    -8
      apps/genrsa.c
  19. +2
    -2
      apps/nseq.c
  20. +8
    -8
      apps/openssl.c
  21. +6
    -6
      apps/pem_mail.c
  22. +3
    -3
      apps/pkcs12.c
  23. +6
    -6
      apps/pkcs7.c
  24. +10
    -10
      apps/req.c
  25. +6
    -6
      apps/rsa.c
  26. +3
    -3
      apps/s_cb.c
  27. +4
    -4
      apps/s_client.c
  28. +6
    -6
      apps/s_server.c
  29. +1
    -1
      apps/s_socket.c
  30. +4
    -4
      apps/s_time.c
  31. +4
    -4
      apps/sc.c
  32. +5
    -5
      apps/sess_id.c
  33. +19
    -19
      apps/speed.c
  34. +4
    -4
      apps/verify.c
  35. +2
    -2
      apps/version.c
  36. +9
    -9
      apps/x509.c
  37. +2
    -2
      bugs/stream.c
  38. +3
    -3
      crypto/Makefile.ssl
  39. +3
    -3
      crypto/asn1/Makefile.ssl
  40. +1
    -1
      crypto/asn1/a_bitstr.c
  41. +1
    -1
      crypto/asn1/a_bmp.c
  42. +1
    -1
      crypto/asn1/a_bool.c
  43. +1
    -1
      crypto/asn1/a_bytes.c
  44. +2
    -2
      crypto/asn1/a_d2i_fp.c
  45. +3
    -3
      crypto/asn1/a_digest.c
  46. +1
    -1
      crypto/asn1/a_dup.c
  47. +1
    -1
      crypto/asn1/a_enum.c
  48. +1
    -1
      crypto/asn1/a_gentm.c
  49. +2
    -2
      crypto/asn1/a_hdr.c
  50. +2
    -2
      crypto/asn1/a_i2d_fp.c
  51. +1
    -1
      crypto/asn1/a_int.c
  52. +2
    -2
      crypto/asn1/a_meth.c
  53. +3
    -3
      crypto/asn1/a_object.c
  54. +1
    -1
      crypto/asn1/a_octet.c
  55. +1
    -1
      crypto/asn1/a_print.c
  56. +1
    -1
      crypto/asn1/a_set.c
  57. +5
    -5
      crypto/asn1/a_sign.c
  58. +1
    -1
      crypto/asn1/a_time.c
  59. +1
    -1
      crypto/asn1/a_type.c
  60. +1
    -1
      crypto/asn1/a_utctm.c
  61. +1
    -1
      crypto/asn1/a_utf8.c
  62. +5
    -5
      crypto/asn1/a_verify.c
  63. +1
    -1
      crypto/asn1/a_vis.c
  64. +2
    -2
      crypto/asn1/asn1.h
  65. +2
    -2
      crypto/asn1/asn1_err.c
  66. +2
    -2
      crypto/asn1/asn1_lib.c
  67. +3
    -3
      crypto/asn1/asn1_mac.h
  68. +3
    -3
      crypto/asn1/asn1_par.c
  69. +1
    -1
      crypto/asn1/asn_pack.c
  70. +4
    -4
      crypto/asn1/d2i_dhp.c
  71. +4
    -4
      crypto/asn1/d2i_dsap.c
  72. +4
    -4
      crypto/asn1/d2i_pr.c
  73. +4
    -4
      crypto/asn1/d2i_pu.c
  74. +4
    -4
      crypto/asn1/d2i_r_pr.c
  75. +4
    -4
      crypto/asn1/d2i_r_pu.c
  76. +4
    -4
      crypto/asn1/d2i_s_pr.c
  77. +4
    -4
      crypto/asn1/d2i_s_pu.c
  78. +2
    -2
      crypto/asn1/evp_asn1.c
  79. +2
    -2
      crypto/asn1/f.c
  80. +2
    -2
      crypto/asn1/f_enum.c
  81. +2
    -2
      crypto/asn1/f_int.c
  82. +2
    -2
      crypto/asn1/f_string.c
  83. +3
    -3
      crypto/asn1/i2d_dhp.c
  84. +3
    -3
      crypto/asn1/i2d_dsap.c
  85. +3
    -3
      crypto/asn1/i2d_pr.c
  86. +3
    -3
      crypto/asn1/i2d_pu.c
  87. +4
    -4
      crypto/asn1/i2d_r_pr.c
  88. +4
    -4
      crypto/asn1/i2d_r_pu.c
  89. +4
    -4
      crypto/asn1/i2d_s_pr.c
  90. +4
    -4
      crypto/asn1/i2d_s_pu.c
  91. +5
    -5
      crypto/asn1/n_pkey.c
  92. +4
    -4
      crypto/asn1/nsseq.c
  93. +2
    -2
      crypto/asn1/p5_pbe.c
  94. +2
    -2
      crypto/asn1/p5_pbev2.c
  95. +2
    -2
      crypto/asn1/p7_dgst.c
  96. +2
    -2
      crypto/asn1/p7_enc.c
  97. +2
    -2
      crypto/asn1/p7_enc_c.c
  98. +2
    -2
      crypto/asn1/p7_evp.c
  99. +2
    -2
      crypto/asn1/p7_i_s.c
  100. +2
    -2
      crypto/asn1/p7_lib.c

+ 25
- 0
Configure View File

@ -542,6 +542,31 @@ if($IsWindows) {
system 'make -f Makefile.ssl links' if !$IsWindows;
my $pwd=`pwd`;
chop($pwd);
print <<EOF;
NOTE: The OpenSSL header files have been moved from include/*.h
to include/openssl/*.h. To include OpenSSL header files, now
directives of the form
#include <openssl/foo.h>
should be used instead of #include <foo.h>.
These new file locations allow installing the OpenSSL header
files in /usr/local/include/openssl/ and should help avoid
conflicts with other libraries.
To compile programs that use the old form <foo.h>,
usually an additional compiler option will suffice: E.g., add
-I/usr/local/include/openssl
or
-I$pwd/include/openssl
to the CFLAGS in the Makefile of the program that you want to compile.
Please make sure that no old OpenSSL header files are around:
The include directory should now be empty except for the openssl
subdirectory.
EOF
exit(0);
sub bad_target


+ 3
- 1
Makefile.org View File

@ -215,7 +215,8 @@ files:
links:
@$(TOP)/util/point.sh Makefile.ssl Makefile
@$(TOP)/util/mklink.sh include $(EXHEADER)
@-mkdir -p include/openssl 2>/dev/null
@$(TOP)/util/mklink.sh include/openssl $(EXHEADER)
@for i in $(DIRS); do \
(cd $$i && echo "making links in $$i..." && \
$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' links ) || exit 1; \
@ -290,6 +291,7 @@ install: all
@-mkdir -p $(INSTALLTOP)/bin 2>/dev/null
@-mkdir -p $(INSTALLTOP)/lib 2>/dev/null
@-mkdir -p $(INSTALLTOP)/include 2>/dev/null
@-mkdir -p $(INSTALLTOP)/include/openssl 2>/dev/null
@-mkdir -p $(INSTALLTOP)/certs 2>/dev/null
@-mkdir -p $(INSTALLTOP)/private 2>/dev/null
@for i in $(DIRS) ;\


+ 5
- 5
apps/apps.h View File

@ -59,11 +59,11 @@
#ifndef HEADER_APPS_H
#define HEADER_APPS_H
#include "e_os.h"
#include <openssl/e_os.h>
#include "buffer.h"
#include "bio.h"
#include "crypto.h"
#include <openssl/buffer.h>
#include <openssl/bio.h>
#include <openssl/crypto.h>
#include "progs.h"
#ifdef NO_STDIO
@ -88,7 +88,7 @@ extern BIO *bio_err;
#else
#define MAIN(a,v) PROG(a,v)
#include "conf.h"
#include <openssl/conf.h>
extern LHASH *config;
extern char *default_config_file;
extern BIO *bio_err;


+ 4
- 4
apps/asn1pars.c View File

@ -64,10 +64,10 @@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
#include "err.h"
#include "evp.h"
#include "x509.h"
#include "pem.h"
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
/* -inform arg - input format - default PEM (DER or PEM)
* -in arg - input file - default stdin


+ 10
- 10
apps/ca.c View File

@ -64,16 +64,16 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "apps.h"
#include "conf.h"
#include "bio.h"
#include "err.h"
#include "bn.h"
#include "txt_db.h"
#include "evp.h"
#include "x509.h"
#include "x509v3.h"
#include "objects.h"
#include "pem.h"
#include <openssl/conf.h>
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/bn.h>
#include <openssl/txt_db.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/objects.h>
#include <openssl/pem.h>
#ifndef W_OK
#include <sys/file.h>


+ 2
- 2
apps/ciphers.c View File

@ -63,8 +63,8 @@
#define APPS_WIN16
#endif
#include "apps.h"
#include "err.h"
#include "ssl.h"
#include <openssl/err.h>
#include <openssl/ssl.h>
#undef PROG
#define PROG ciphers_main


+ 5
- 5
apps/crl.c View File

@ -60,11 +60,11 @@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
#include "bio.h"
#include "err.h"
#include "x509.h"
#include "x509v3.h"
#include "pem.h"
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/pem.h>
#undef PROG
#define PROG crl_main


+ 6
- 6
apps/crl2p7.c View File

@ -65,12 +65,12 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "apps.h"
#include "err.h"
#include "evp.h"
#include "x509.h"
#include "pkcs7.h"
#include "pem.h"
#include "objects.h"
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/pkcs7.h>
#include <openssl/pem.h>
#include <openssl/objects.h>
#ifndef NOPROTO
static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);


+ 6
- 6
apps/dgst.c View File

@ -60,12 +60,12 @@
#include <string.h>
#include <stdlib.h>
#include "apps.h"
#include "bio.h"
#include "err.h"
#include "evp.h"
#include "objects.h"
#include "x509.h"
#include "pem.h"
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#undef BUFSIZE
#define BUFSIZE 1024*8


+ 6
- 6
apps/dh.c View File

@ -61,12 +61,12 @@
#include <time.h>
#include <string.h>
#include "apps.h"
#include "bio.h"
#include "err.h"
#include "bn.h"
#include "dh.h"
#include "x509.h"
#include "pem.h"
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/bn.h>
#include <openssl/dh.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#undef PROG
#define PROG dh_main


+ 6
- 6
apps/dsa.c View File

@ -61,12 +61,12 @@
#include <string.h>
#include <time.h>
#include "apps.h"
#include "bio.h"
#include "err.h"
#include "dsa.h"
#include "evp.h"
#include "x509.h"
#include "pem.h"
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/dsa.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#undef PROG
#define PROG dsa_main


+ 7
- 7
apps/dsaparam.c View File

@ -61,13 +61,13 @@
#include <time.h>
#include <string.h>
#include "apps.h"
#include "bio.h"
#include "err.h"
#include "bn.h"
#include "rand.h"
#include "dsa.h"
#include "x509.h"
#include "pem.h"
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/bn.h>
#include <openssl/rand.h>
#include <openssl/dsa.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#undef PROG
#define PROG dsaparam_main


+ 15
- 15
apps/eay.c View File

@ -64,27 +64,27 @@
#define USE_SOCKETS
#include "../e_os.h"
#include "bio.h"
#include "stack.h"
#include "lhash.h"
#include <openssl/bio.h>
#include <openssl/stack.h>
#include <openssl/lhash.h>
#include "err.h"
#include <openssl/err.h>
#include "bn.h"
#include <openssl/bn.h>
#include "evp.h"
#include <openssl/evp.h>
#include "rand.h"
#include "conf.h"
#include "txt_db.h"
#include <openssl/rand.h>
#include <openssl/conf.h>
#include <openssl/txt_db.h>
#include "err.h"
#include <openssl/err.h>
#include "x509.h"
#include "pkcs7.h"
#include "pem.h"
#include "asn1.h"
#include "objects.h"
#include <openssl/x509.h>
#include <openssl/pkcs7.h>
#include <openssl/pem.h>
#include <openssl/asn1.h>
#include <openssl/objects.h>
#define MONOLITH


+ 7
- 7
apps/enc.c View File

@ -60,15 +60,15 @@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
#include "bio.h"
#include "err.h"
#include "evp.h"
#include "objects.h"
#include "x509.h"
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
#ifdef NO_MD5
#include "md5.h"
#include <openssl/md5.h>
#endif
#include "pem.h"
#include <openssl/pem.h>
#ifndef NOPROTO
int set_hex(char *in,unsigned char *out,int size);


+ 4
- 4
apps/errstr.c View File

@ -60,10 +60,10 @@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
#include "bio.h"
#include "lhash.h"
#include "err.h"
#include "ssl.h"
#include <openssl/bio.h>
#include <openssl/lhash.h>
#include <openssl/err.h>
#include <openssl/ssl.h>
#undef PROG
#define PROG errstr_main


+ 7
- 7
apps/gendh.c View File

@ -61,13 +61,13 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "apps.h"
#include "bio.h"
#include "rand.h"
#include "err.h"
#include "bn.h"
#include "dh.h"
#include "x509.h"
#include "pem.h"
#include <openssl/bio.h>
#include <openssl/rand.h>
#include <openssl/err.h>
#include <openssl/bn.h>
#include <openssl/dh.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#define DEFBITS 512
#undef PROG


+ 7
- 7
apps/gendsa.c View File

@ -61,13 +61,13 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "apps.h"
#include "bio.h"
#include "rand.h"
#include "err.h"
#include "bn.h"
#include "dsa.h"
#include "x509.h"
#include "pem.h"
#include <openssl/bio.h>
#include <openssl/rand.h>
#include <openssl/err.h>
#include <openssl/bn.h>
#include <openssl/dsa.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#define DEFBITS 512
#undef PROG


+ 8
- 8
apps/genrsa.c View File

@ -61,14 +61,14 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "apps.h"
#include "bio.h"
#include "rand.h"
#include "err.h"
#include "bn.h"
#include "rsa.h"
#include "evp.h"
#include "x509.h"
#include "pem.h"
#include <openssl/bio.h>
#include <openssl/rand.h>
#include <openssl/err.h>
#include <openssl/bn.h>
#include <openssl/rsa.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#define DEFBITS 512
#undef PROG


+ 2
- 2
apps/nseq.c View File

@ -58,8 +58,8 @@
#include <stdio.h>
#include <string.h>
#include "pem.h"
#include "err.h"
#include <openssl/pem.h>
#include <openssl/err.h>
#include "apps.h"
#undef PROG


+ 8
- 8
apps/openssl.c View File

@ -63,19 +63,19 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include "bio.h"
#include "crypto.h"
#include "lhash.h"
#include "conf.h"
#include "x509.h"
#include "pem.h"
#include "ssl.h"
#include <openssl/bio.h>
#include <openssl/crypto.h>
#include <openssl/lhash.h>
#include <openssl/conf.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#include <openssl/ssl.h>
#define SSLEAY /* turn off a few special case MONOLITH macros */
#define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
#define SSLEAY_SRC
#include "apps.h"
#include "s_apps.h"
#include "err.h"
#include <openssl/err.h>
/*
#ifdef WINDOWS


+ 6
- 6
apps/pem_mail.c View File

@ -57,12 +57,12 @@
*/
#include <stdio.h>
#include "rsa.h"
#include "evp.h"
#include "objects.h"
#include "x509.h"
#include "err.h"
#include "pem.h"
#include <openssl/rsa.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/err.h>
#include <openssl/pem.h>
#include "apps.h"
#undef PROG


+ 3
- 3
apps/pkcs12.c View File

@ -59,9 +59,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <pem.h>
#include <err.h>
#include "pkcs12.h"
#include <openssl/pem.h>
#include <openssl/err.h>
#include <openssl/pkcs12.h>
#include "apps.h"
#define PROG pkcs12_main


+ 6
- 6
apps/pkcs7.c View File

@ -61,12 +61,12 @@
#include <string.h>
#include <time.h>
#include "apps.h"
#include "err.h"
#include "objects.h"
#include "evp.h"
#include "x509.h"
#include "pkcs7.h"
#include "pem.h"
#include <openssl/err.h>
#include <openssl/objects.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/pkcs7.h>
#include <openssl/pem.h>
#undef PROG
#define PROG pkcs7_main


+ 10
- 10
apps/req.c View File

@ -64,16 +64,16 @@
#define APPS_WIN16
#endif
#include "apps.h"
#include "bio.h"
#include "evp.h"
#include "rand.h"
#include "conf.h"
#include "err.h"
#include "asn1.h"
#include "x509.h"
#include "x509v3.h"
#include "objects.h"
#include "pem.h"
#include <openssl/bio.h>
#include <openssl/evp.h>
#include <openssl/rand.h>
#include <openssl/conf.h>
#include <openssl/err.h>
#include <openssl/asn1.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/objects.h>
#include <openssl/pem.h>
#define SECTION "req"


+ 6
- 6
apps/rsa.c View File

@ -61,12 +61,12 @@
#include <string.h>
#include <time.h>
#include "apps.h"
#include "bio.h"
#include "err.h"
#include "rsa.h"
#include "evp.h"
#include "x509.h"
#include "pem.h"
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/rsa.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#undef PROG
#define PROG rsa_main


+ 3
- 3
apps/s_cb.c View File

@ -63,9 +63,9 @@
#include "apps.h"
#undef NON_MAIN
#undef USE_SOCKETS
#include "err.h"
#include "x509.h"
#include "ssl.h"
#include <openssl/err.h>
#include <openssl/x509.h>
#include <openssl/ssl.h>
#include "s_apps.h"
int verify_depth=0;


+ 4
- 4
apps/s_client.c View File

@ -64,10 +64,10 @@
#define APPS_WIN16
#endif
#include "apps.h"
#include "x509.h"
#include "ssl.h"
#include "err.h"
#include "pem.h"
#include <openssl/x509.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
#include <openssl/pem.h>
#include "s_apps.h"
#undef PROG


+ 6
- 6
apps/s_server.c View File

@ -64,14 +64,14 @@
#ifdef NO_STDIO
#define APPS_WIN16
#endif
#include "lhash.h"
#include "bn.h"
#include <openssl/lhash.h>
#include <openssl/bn.h>
#define USE_SOCKETS
#include "apps.h"
#include "err.h"
#include "pem.h"
#include "x509.h"
#include "ssl.h"
#include <openssl/err.h>
#include <openssl/pem.h>
#include <openssl/x509.h>
#include <openssl/ssl.h>
#include "s_apps.h"
#ifndef NOPROTO


+ 1
- 1
apps/s_socket.c View File

@ -67,7 +67,7 @@
#undef USE_SOCKETS
#undef NON_MAIN
#include "s_apps.h"
#include "ssl.h"
#include <openssl/ssl.h>
#ifndef NOPROTO
static struct hostent *GetHostByName(char *name);


+ 4
- 4
apps/s_time.c View File

@ -70,13 +70,13 @@
#ifdef NO_STDIO
#define APPS_WIN16
#endif
#include "x509.h"
#include "ssl.h"
#include "pem.h"
#include <openssl/x509.h>
#include <openssl/ssl.h>
#include <openssl/pem.h>
#define USE_SOCKETS
#include "apps.h"
#include "s_apps.h"
#include "err.h"
#include <openssl/err.h>
#ifdef WIN32_STUFF
#include "winmain.h"
#include "wintext.h"


+ 4
- 4
apps/sc.c View File

@ -64,10 +64,10 @@
#define APPS_WIN16
#endif
#include "apps.h"
#include "x509.h"
#include "ssl.h"
#include "err.h"
#include "pem.h"
#include <openssl/x509.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
#include <openssl/pem.h>
#include "s_apps.h"
#ifdef WINDOWS


+ 5
- 5
apps/sess_id.c View File

@ -60,11 +60,11 @@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
#include "bio.h"
#include "err.h"
#include "x509.h"
#include "pem.h"
#include "ssl.h"
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#include <openssl/ssl.h>
#undef PROG
#define PROG sess_id_main


+ 19
- 19
apps/speed.c View File

@ -78,9 +78,9 @@
#ifdef NO_STDIO
#define APPS_WIN16
#endif
#include "crypto.h"
#include "rand.h"
#include "err.h"
#include <openssl/crypto.h>
#include <openssl/rand.h>
#include <openssl/err.h>
#ifndef MSDOS
#define TIMES
@ -114,47 +114,47 @@ struct tms {
#endif
#ifndef NO_DES
#include "des.h"
#include <openssl/des.h>
#endif
#ifndef NO_MD2
#include "md2.h"
#include <openssl/md2.h>
#endif
#ifndef NO_MDC2
#include "mdc2.h"
#include <openssl/mdc2.h>
#endif
#ifndef NO_MD5
#include "md5.h"
#include "hmac.h"
#include "evp.h"
#include <openssl/md5.h>
#include <openssl/hmac.h>
#include <openssl/evp.h>
#endif
#ifndef NO_SHA1
#include "sha.h"
#include <openssl/sha.h>
#endif
#ifndef NO_RMD160
#include "ripemd.h"
#include <openssl/ripemd.h>
#endif
#ifndef NO_RC4
#include "rc4.h"
#include <openssl/rc4.h>
#endif
#ifndef NO_RC5
#include "rc5.h"
#include <openssl/rc5.h>
#endif
#ifndef NO_RC2
#include "rc2.h"
#include <openssl/rc2.h>
#endif
#ifndef NO_IDEA
#include "idea.h"
#include <openssl/idea.h>
#endif
#ifndef NO_BLOWFISH
#include "blowfish.h"
#include <openssl/blowfish.h>
#endif
#ifndef NO_CAST
#include "cast.h"
#include <openssl/cast.h>
#endif
#ifndef NO_RSA
#include "rsa.h"
#include <openssl/rsa.h>
#endif
#include "x509.h"
#include <openssl/x509.h>
#include "./testrsa.h"
#ifndef NO_DSA
#include "./testdsa.h"


+ 4
- 4
apps/verify.c View File

@ -60,10 +60,10 @@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
#include "bio.h"
#include "err.h"
#include "x509.h"
#include "pem.h"
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#undef PROG
#define PROG verify_main


+ 2
- 2
apps/version.c View File

@ -60,8 +60,8 @@
#include <stdlib.h>
#include <string.h>
#include "apps.h"
#include "evp.h"
#include "crypto.h"
#include <openssl/evp.h>
#include <openssl/crypto.h>
#undef PROG
#define PROG version_main


+ 9
- 9
apps/x509.c View File

@ -63,15 +63,15 @@
#define APPS_WIN16
#endif
#include "apps.h"
#include "bio.h"
#include "asn1.h"
#include "err.h"
#include "bn.h"
#include "evp.h"
#include "x509.h"
#include "x509v3.h"
#include "objects.h"
#include "pem.h"
#include <openssl/bio.h>
#include <openssl/asn1.h>
#include <openssl/err.h>
#include <openssl/bn.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/objects.h>
#include <openssl/pem.h>
#undef PROG
#define PROG x509_main


+ 2
- 2
bugs/stream.c View File

@ -57,11 +57,11 @@
*/
#include <stdio.h>
#include "rc4.h"
#include <openssl/rc4.h>
#ifdef NO_DES
#include <des.h>
#else
#include "des.h"
#include <openssl/des.h>
#endif
/* show how stream ciphers are not very good. The mac has no affect


+ 3
- 3
crypto/Makefile.ssl View File

@ -69,7 +69,7 @@ files:
links:
@$(TOP)/util/point.sh Makefile.ssl Makefile
@$(TOP)/util/mklink.sh ../include $(EXHEADER)
@$(TOP)/util/mklink.sh ../include/openssl $(EXHEADER)
@$(TOP)/util/mklink.sh ../test $(TEST)
@$(TOP)/util/mklink.sh ../apps $(APPS)
@$(TOP)/util/point.sh Makefile.ssl Makefile
@ -100,8 +100,8 @@ tests:
install:
@for i in $(EXHEADER) ;\
do \
(cp $$i $(INSTALLTOP)/include/$$i; \
chmod 644 $(INSTALLTOP)/include/$$i ); \
(cp $$i $(INSTALLTOP)/include/openssl/$$i; \
chmod 644 $(INSTALLTOP)/include/openssl/$$i ); \
done;
@for i in $(SDIRS) ;\
do \


+ 3
- 3
crypto/asn1/Makefile.ssl View File

@ -83,15 +83,15 @@ files:
links:
@$(TOP)/util/point.sh Makefile.ssl Makefile
@$(TOP)/util/mklink.sh ../../include $(EXHEADER)
@$(TOP)/util/mklink.sh ../../include/openssl $(EXHEADER)
@$(TOP)/util/mklink.sh ../../test $(TEST)
@$(TOP)/util/mklink.sh ../../apps $(APPS)
install:
@for i in $(EXHEADER) ; \
do \
(cp $$i $(INSTALLTOP)/include/$$i; \
chmod 644 $(INSTALLTOP)/include/$$i ); \
(cp $$i $(INSTALLTOP)/include/openssl/$$i; \
chmod 644 $(INSTALLTOP)/include/openssl/$$i ); \
done;
tags:


+ 1
- 1
crypto/asn1/a_bitstr.c View File

@ -58,7 +58,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include "asn1.h"
#include <openssl/asn1.h>
/* ASN1err(ASN1_F_ASN1_STRING_NEW,ASN1_R_STRING_TOO_SHORT);
* ASN1err(ASN1_F_D2I_ASN1_BIT_STRING,ASN1_R_EXPECTING_A_BIT_STRING);


+ 1
- 1
crypto/asn1/a_bmp.c View File

@ -58,7 +58,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include "asn1.h"
#include <openssl/asn1.h>
/* ASN1err(ASN1_F_D2I_ASN1_BMPSTRING,ASN1_R_EXPECTING_AN_INTEGER);
*/


+ 1
- 1
crypto/asn1/a_bool.c View File

@ -58,7 +58,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include "asn1.h"
#include <openssl/asn1.h>
/* ASN1err(ASN1_F_D2I_ASN1_BOOLEAN,ASN1_R_EXPECTING_A_BOOLEAN);
* ASN1err(ASN1_F_D2I_ASN1_BOOLEAN,ASN1_R_BOOLEAN_IS_WRONG_LENGTH);


+ 1
- 1
crypto/asn1/a_bytes.c View File

@ -58,7 +58,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include "asn1_mac.h"
#include <openssl/asn1_mac.h>
/* ASN1err(ASN1_F_D2I_ASN1_TYPE_BYTES,ASN1_R_WRONG_TYPE);
* ASN1err(ASN1_F_ASN1_COLLATE_PRIMATIVE,ASN1_R_WRONG_TAG);


+ 2
- 2
crypto/asn1/a_d2i_fp.c View File

@ -58,8 +58,8 @@
#include <stdio.h>
#include "cryptlib.h"
#include "buffer.h"
#include "asn1_mac.h"
#include <openssl/buffer.h>
#include <openssl/asn1_mac.h>
#define HEADER_SIZE 8


+ 3
- 3
crypto/asn1/a_digest.c View File

@ -62,9 +62,9 @@
#include <sys/stat.h>
#include "cryptlib.h"
#include "evp.h"
#include "x509.h"
#include "buffer.h"
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/buffer.h>
int ASN1_digest(int (*i2d)(), EVP_MD *type, char *data, unsigned char *md,
unsigned int *len)


+ 1
- 1
crypto/asn1/a_dup.c View File

@ -58,7 +58,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include "asn1_mac.h"
#include <openssl/asn1_mac.h>
#define READ_CHUNK 2048


+ 1
- 1
crypto/asn1/a_enum.c View File

@ -58,7 +58,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include "asn1.h"
#include <openssl/asn1.h>
/* Support for ASN1 ENUMERATED type: based on a_int.c */


+ 1
- 1
crypto/asn1/a_gentm.c View File

@ -61,7 +61,7 @@
#include <stdio.h>
#include <time.h>
#include "cryptlib.h"
#include "asn1.h"
#include <openssl/asn1.h>
/* ASN1err(ASN1_F_ASN1_GENERALIZEDTIME_NEW,ASN1_R_GENERALIZEDTIME_TOO_LONG);
* ASN1err(ASN1_F_D2I_ASN1_GENERALIZEDTIME,ASN1_R_EXPECTING_A_GENERALIZEDTIME);


+ 2
- 2
crypto/asn1/a_hdr.c View File

@ -58,8 +58,8 @@
#include <stdio.h>
#include "cryptlib.h"
#include "asn1_mac.h"
#include "asn1.h"
#include <openssl/asn1_mac.h>
#include <openssl/asn1.h>
/*
* ASN1err(ASN1_F_D2I_ASN1_HEADER,ERR_R_ASN1_LENGTH_MISMATCH);


+ 2
- 2
crypto/asn1/a_i2d_fp.c View File

@ -58,8 +58,8 @@
#include <stdio.h>
#include "cryptlib.h"
#include "buffer.h"
#include "asn1_mac.h"
#include <openssl/buffer.h>
#include <openssl/asn1_mac.h>
#ifndef NO_FP_API
int ASN1_i2d_fp(int (*i2d)(), FILE *out, unsigned char *x)


+ 1
- 1
crypto/asn1/a_int.c View File

@ -58,7 +58,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include "asn1.h"
#include <openssl/asn1.h>
/* ASN1err(ASN1_F_D2I_ASN1_INTEGER,ASN1_R_EXPECTING_AN_INTEGER);
*/


+ 2
- 2
crypto/asn1/a_meth.c View File

@ -58,8 +58,8 @@
#include <stdio.h>
#include "cryptlib.h"
#include "buffer.h"
#include "x509.h"
#include <openssl/buffer.h>
#include <openssl/x509.h>
static ASN1_METHOD ia5string_meth={
(int (*)()) i2d_ASN1_IA5STRING,


+ 3
- 3
crypto/asn1/a_object.c View File

@ -58,9 +58,9 @@
#include <stdio.h>
#include "cryptlib.h"
#include "buffer.h"
#include "asn1.h"
#include "objects.h"
#include <openssl/buffer.h>
#include <openssl/asn1.h>
#include <openssl/objects.h>
/* ASN1err(ASN1_F_ASN1_OBJECT_NEW,ASN1_R_EXPECTING_AN_OBJECT);
* ASN1err(ASN1_F_D2I_ASN1_OBJECT,ASN1_R_BAD_OBJECT_HEADER);


+ 1
- 1
crypto/asn1/a_octet.c View File

@ -58,7 +58,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include "asn1.h"
#include <openssl/asn1.h>
/* ASN1err(ASN1_F_D2I_ASN1_OCTET_STRING,ASN1_R_EXPECTING_AN_OCTET_STRING);
*/


+ 1
- 1
crypto/asn1/a_print.c View File

@ -58,7 +58,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include "asn1.h"
#include <openssl/asn1.h>
/* ASN1err(ASN1_F_D2I_ASN1_PRINT_TYPE,ASN1_R_WRONG_PRINTABLE_TYPE);
* ASN1err(ASN1_F_D2I_ASN1_PRINT_TYPE,ASN1_R_TAG_VALUE_TOO_HIGH);


+ 1
- 1
crypto/asn1/a_set.c View File

@ -58,7 +58,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include "asn1_mac.h"
#include <openssl/asn1_mac.h>
/* ASN1err(ASN1_F_ASN1_TYPE_NEW,ERR_R_MALLOC_FAILURE);
*/


+ 5
- 5
crypto/asn1/a_sign.c View File

@ -62,11 +62,11 @@
#include <sys/stat.h>
#include "cryptlib.h"
#include "bn.h"
#include "evp.h"
#include "x509.h"
#include "objects.h"
#include "buffer.h"
#include <openssl/bn.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/objects.h>
#include <openssl/buffer.h>
int ASN1_sign(int (*i2d)(), X509_ALGOR *algor1, X509_ALGOR *algor2,
ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey,


+ 1
- 1
crypto/asn1/a_time.c View File

@ -64,7 +64,7 @@
#include <stdio.h>
#include <time.h>
#include "cryptlib.h"
#include "asn1.h"
#include <openssl/asn1.h>
int i2d_ASN1_TIME(ASN1_TIME *a, unsigned char **pp)
{


+ 1
- 1
crypto/asn1/a_type.c View File

@ -58,7 +58,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include "asn1_mac.h"
#include <openssl/asn1_mac.h>
/* ASN1err(ASN1_F_D2I_ASN1_BYTES,ASN1_R_WRONG_TAG);
* ASN1err(ASN1_F_ASN1_COLLATE_PRIMATIVE,ASN1_R_WRONG_TAG);


+ 1
- 1
crypto/asn1/a_utctm.c View File

@ -59,7 +59,7 @@
#include <stdio.h>
#include <time.h>
#include "cryptlib.h"
#include "asn1.h"
#include <openssl/asn1.h>
/* ASN1err(ASN1_F_ASN1_UTCTIME_NEW,ASN1_R_UTCTIME_TOO_LONG);
* ASN1err(ASN1_F_D2I_ASN1_UTCTIME,ASN1_R_EXPECTING_A_UTCTIME);


+ 1
- 1
crypto/asn1/a_utf8.c View File

@ -58,7 +58,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include "asn1.h"
#include <openssl/asn1.h>
/* ASN1err(ASN1_F_D2I_ASN1_UTF8STRING,ERR_R_MALLOC_FAILURE);
*/


+ 5
- 5
crypto/asn1/a_verify.c View File

@ -62,11 +62,11 @@
#include <sys/stat.h>
#include "cryptlib.h"
#include "bn.h"
#include "x509.h"
#include "objects.h"
#include "buffer.h"
#include "evp.h"
#include <openssl/bn.h>
#include <openssl/x509.h>
#include <openssl/objects.h>
#include <openssl/buffer.h>
#include <openssl/evp.h>
int ASN1_verify(int (*i2d)(), X509_ALGOR *a, ASN1_BIT_STRING *signature,
char *data, EVP_PKEY *pkey)


+ 1
- 1
crypto/asn1/a_vis.c View File

@ -58,7 +58,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include "asn1.h"
#include <openssl/asn1.h>
/* ASN1err(ASN1_F_D2I_ASN1_VISIBLESTRING,ERR_R_MALLOC_FAILURE);
*/


+ 2
- 2
crypto/asn1/asn1.h View File

@ -64,8 +64,8 @@ extern "C" {
#endif
#include <time.h>
#include "bn.h"
#include "stack.h"
#include <openssl/bn.h>
#include <openssl/stack.h>
#define V_ASN1_UNIVERSAL 0x00
#define V_ASN1_APPLICATION 0x40


+ 2
- 2
crypto/asn1/asn1_err.c View File

@ -56,8 +56,8 @@
* [including the GNU Public Licence.]
*/
#include <stdio.h>
#include "err.h"
#include "asn1.h"
#include <openssl/err.h>
#include <openssl/asn1.h>
/* BEGIN ERROR CODES */
#ifndef NO_ERR


+ 2
- 2
crypto/asn1/asn1_lib.c View File

@ -58,8 +58,8 @@
#include <stdio.h>
#include "cryptlib.h"
#include "asn1.h"
#include "asn1_mac.h"
#include <openssl/asn1.h>
#include <openssl/asn1_mac.h>
#ifndef NOPROTO
static int asn1_get_length(unsigned char **pp,int *inf,long *rl,int max);


+ 3
- 3
crypto/asn1/asn1_mac.h View File

@ -63,9 +63,9 @@
extern "C" {
#endif
#include "asn1.h"
#include "x509.h"
#include "pkcs7.h"
#include <openssl/asn1.h>
#include <openssl/x509.h>
#include <openssl/pkcs7.h>
#ifndef ASN1_MAC_ERR_LIB
#define ASN1_MAC_ERR_LIB ERR_LIB_ASN1


+ 3
- 3
crypto/asn1/asn1_par.c View File

@ -58,9 +58,9 @@
#include <stdio.h>
#include "cryptlib.h"
#include "buffer.h"
#include "objects.h"
#include "x509.h"
#include <openssl/buffer.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
#ifndef NOPROTO
static int asn1_print_info(BIO *bp, int tag, int xclass,int constructed,


+ 1
- 1
crypto/asn1/asn_pack.c View File

@ -58,7 +58,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include "asn1.h"
#include <openssl/asn1.h>
/* ASN1 packing and unpacking functions */


+ 4
- 4
crypto/asn1/d2i_dhp.c View File

@ -58,10 +58,10 @@
#include <stdio.h>
#include "cryptlib.h"
#include "bn.h"
#include "dh.h"
#include "objects.h"
#include "asn1_mac.h"
#include <openssl/bn.h>
#include <openssl/dh.h>
#include <openssl/objects.h>
#include <openssl/asn1_mac.h>
/*
* ASN1err(ASN1_F_D2I_DHPARAMS,ERR_R_ASN1_LENGTH_MISMATCH);


+ 4
- 4
crypto/asn1/d2i_dsap.c View File

@ -58,10 +58,10 @@
#include <stdio.h>
#include "cryptlib.h"
#include "bn.h"
#include "dsa.h"
#include "objects.h"
#include "asn1_mac.h"
#include <openssl/bn.h>
#include <openssl/dsa.h>
#include <openssl/objects.h>
#include <openssl/asn1_mac.h>
/*
* ASN1err(ASN1_F_D2I_DSAPARAMS,ERR_R_ASN1_LENGTH_MISMATCH);


+ 4
- 4
crypto/asn1/d2i_pr.c View File

@ -58,10 +58,10 @@
#include <stdio.h>
#include "cryptlib.h"
#include "bn.h"
#include "evp.h"
#include "objects.h"
#include "x509.h"
#include <openssl/bn.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, unsigned char **pp,
long length)


+ 4
- 4
crypto/asn1/d2i_pu.c View File

@ -58,10 +58,10 @@
#include <stdio.h>
#include "cryptlib.h"
#include "bn.h"
#include "evp.h"
#include "objects.h"
#include "x509.h"
#include <openssl/bn.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, unsigned char **pp,
long length)


+ 4
- 4
crypto/asn1/d2i_r_pr.c View File

@ -58,10 +58,10 @@
#include <stdio.h>
#include "cryptlib.h"
#include "bn.h"
#include "rsa.h"
#include "objects.h"
#include "asn1_mac.h"
#include <openssl/bn.h>
#include <openssl/rsa.h>
#include <openssl/objects.h>
#include <openssl/asn1_mac.h>
/*
* ASN1err(ASN1_F_D2I_RSAPRIVATEKEY,ERR_R_ASN1_LENGTH_MISMATCH);


+ 4
- 4
crypto/asn1/d2i_r_pu.c View File

@ -58,10 +58,10 @@
#include <stdio.h>
#include "cryptlib.h"
#include "bn.h"
#include "rsa.h"
#include "objects.h"
#include "asn1_mac.h"
#include <openssl/bn.h>
#include <openssl/rsa.h>
#include <openssl/objects.h>
#include <openssl/asn1_mac.h>
/*