diff options
Diffstat (limited to 'src/lib/libcrypto/ocsp')
| -rw-r--r-- | src/lib/libcrypto/ocsp/Makefile | 213 | ||||
| -rw-r--r-- | src/lib/libcrypto/ocsp/ocsp_vfy.c | 1 |
2 files changed, 213 insertions, 1 deletions
diff --git a/src/lib/libcrypto/ocsp/Makefile b/src/lib/libcrypto/ocsp/Makefile new file mode 100644 index 0000000000..60c414cf4d --- /dev/null +++ b/src/lib/libcrypto/ocsp/Makefile | |||
| @@ -0,0 +1,213 @@ | |||
| 1 | # | ||
| 2 | # OpenSSL/ocsp/Makefile | ||
| 3 | # | ||
| 4 | |||
| 5 | DIR= ocsp | ||
| 6 | TOP= ../.. | ||
| 7 | CC= cc | ||
| 8 | INCLUDES= -I.. -I$(TOP) -I../../include | ||
| 9 | CFLAG=-g | ||
| 10 | MAKEFILE= Makefile | ||
| 11 | AR= ar r | ||
| 12 | |||
| 13 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
| 14 | |||
| 15 | GENERAL=Makefile README | ||
| 16 | TEST= | ||
| 17 | APPS= | ||
| 18 | |||
| 19 | LIB=$(TOP)/libcrypto.a | ||
| 20 | LIBSRC= ocsp_asn.c ocsp_ext.c ocsp_ht.c ocsp_lib.c ocsp_cl.c \ | ||
| 21 | ocsp_srv.c ocsp_prn.c ocsp_vfy.c ocsp_err.c | ||
| 22 | |||
| 23 | LIBOBJ= ocsp_asn.o ocsp_ext.o ocsp_ht.o ocsp_lib.o ocsp_cl.o \ | ||
| 24 | ocsp_srv.o ocsp_prn.o ocsp_vfy.o ocsp_err.o | ||
| 25 | |||
| 26 | SRC= $(LIBSRC) | ||
| 27 | |||
| 28 | EXHEADER= ocsp.h | ||
| 29 | HEADER= $(EXHEADER) | ||
| 30 | |||
| 31 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
| 32 | |||
| 33 | top: | ||
| 34 | (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) | ||
| 35 | |||
| 36 | all: lib | ||
| 37 | |||
| 38 | lib: $(LIBOBJ) | ||
| 39 | $(AR) $(LIB) $(LIBOBJ) | ||
| 40 | $(RANLIB) $(LIB) || echo Never mind. | ||
| 41 | @touch lib | ||
| 42 | |||
| 43 | files: | ||
| 44 | $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO | ||
| 45 | |||
| 46 | links: | ||
| 47 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) | ||
| 48 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) | ||
| 49 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | ||
| 50 | |||
| 51 | install: | ||
| 52 | @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... | ||
| 53 | @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ | ||
| 54 | do \ | ||
| 55 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | ||
| 56 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | ||
| 57 | done; | ||
| 58 | |||
| 59 | tags: | ||
| 60 | ctags $(SRC) | ||
| 61 | |||
| 62 | tests: | ||
| 63 | |||
| 64 | lint: | ||
| 65 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
| 66 | |||
| 67 | depend: | ||
| 68 | @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... | ||
| 69 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC) | ||
| 70 | |||
| 71 | dclean: | ||
| 72 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
| 73 | mv -f Makefile.new $(MAKEFILE) | ||
| 74 | |||
| 75 | clean: | ||
| 76 | rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
| 77 | |||
| 78 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
| 79 | |||
| 80 | ocsp_asn.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h | ||
| 81 | ocsp_asn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | ||
| 82 | ocsp_asn.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h | ||
| 83 | ocsp_asn.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h | ||
| 84 | ocsp_asn.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h | ||
| 85 | ocsp_asn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h | ||
| 86 | ocsp_asn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | ||
| 87 | ocsp_asn.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h | ||
| 88 | ocsp_asn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 89 | ocsp_asn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h | ||
| 90 | ocsp_asn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | ||
| 91 | ocsp_asn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h | ||
| 92 | ocsp_asn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h | ||
| 93 | ocsp_asn.o: ocsp_asn.c | ||
| 94 | ocsp_cl.o: ../../e_os.h ../../include/openssl/asn1.h | ||
| 95 | ocsp_cl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | ||
| 96 | ocsp_cl.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h | ||
| 97 | ocsp_cl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h | ||
| 98 | ocsp_cl.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h | ||
| 99 | ocsp_cl.o: ../../include/openssl/err.h ../../include/openssl/evp.h | ||
| 100 | ocsp_cl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | ||
| 101 | ocsp_cl.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h | ||
| 102 | ocsp_cl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | ||
| 103 | ocsp_cl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h | ||
| 104 | ocsp_cl.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h | ||
| 105 | ocsp_cl.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h | ||
| 106 | ocsp_cl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | ||
| 107 | ocsp_cl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h | ||
| 108 | ocsp_cl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h | ||
| 109 | ocsp_cl.o: ../cryptlib.h ocsp_cl.c | ||
| 110 | ocsp_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | ||
| 111 | ocsp_err.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h | ||
| 112 | ocsp_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | ||
| 113 | ocsp_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h | ||
| 114 | ocsp_err.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h | ||
| 115 | ocsp_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h | ||
| 116 | ocsp_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | ||
| 117 | ocsp_err.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h | ||
| 118 | ocsp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 119 | ocsp_err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h | ||
| 120 | ocsp_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | ||
| 121 | ocsp_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h | ||
| 122 | ocsp_err.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h | ||
| 123 | ocsp_err.o: ocsp_err.c | ||
| 124 | ocsp_ext.o: ../../e_os.h ../../include/openssl/asn1.h | ||
| 125 | ocsp_ext.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | ||
| 126 | ocsp_ext.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h | ||
| 127 | ocsp_ext.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h | ||
| 128 | ocsp_ext.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h | ||
| 129 | ocsp_ext.o: ../../include/openssl/err.h ../../include/openssl/evp.h | ||
| 130 | ocsp_ext.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | ||
| 131 | ocsp_ext.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h | ||
| 132 | ocsp_ext.o: ../../include/openssl/opensslconf.h | ||
| 133 | ocsp_ext.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 134 | ocsp_ext.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h | ||
| 135 | ocsp_ext.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | ||
| 136 | ocsp_ext.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 137 | ocsp_ext.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h | ||
| 138 | ocsp_ext.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_ext.c | ||
| 139 | ocsp_ht.o: ../../e_os.h ../../include/openssl/asn1.h | ||
| 140 | ocsp_ht.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | ||
| 141 | ocsp_ht.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h | ||
| 142 | ocsp_ht.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h | ||
| 143 | ocsp_ht.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h | ||
| 144 | ocsp_ht.o: ../../include/openssl/err.h ../../include/openssl/evp.h | ||
| 145 | ocsp_ht.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | ||
| 146 | ocsp_ht.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h | ||
| 147 | ocsp_ht.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | ||
| 148 | ocsp_ht.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h | ||
| 149 | ocsp_ht.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | ||
| 150 | ocsp_ht.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 151 | ocsp_ht.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h | ||
| 152 | ocsp_ht.o: ../../include/openssl/x509v3.h ocsp_ht.c | ||
| 153 | ocsp_lib.o: ../../e_os.h ../../include/openssl/asn1.h | ||
| 154 | ocsp_lib.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h | ||
| 155 | ocsp_lib.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h | ||
| 156 | ocsp_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | ||
| 157 | ocsp_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h | ||
| 158 | ocsp_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h | ||
| 159 | ocsp_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h | ||
| 160 | ocsp_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | ||
| 161 | ocsp_lib.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h | ||
| 162 | ocsp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 163 | ocsp_lib.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h | ||
| 164 | ocsp_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h | ||
| 165 | ocsp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | ||
| 166 | ocsp_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 167 | ocsp_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h | ||
| 168 | ocsp_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_lib.c | ||
| 169 | ocsp_prn.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | ||
| 170 | ocsp_prn.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h | ||
| 171 | ocsp_prn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | ||
| 172 | ocsp_prn.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h | ||
| 173 | ocsp_prn.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h | ||
| 174 | ocsp_prn.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h | ||
| 175 | ocsp_prn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | ||
| 176 | ocsp_prn.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h | ||
| 177 | ocsp_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 178 | ocsp_prn.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h | ||
| 179 | ocsp_prn.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h | ||
| 180 | ocsp_prn.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | ||
| 181 | ocsp_prn.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h | ||
| 182 | ocsp_prn.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h | ||
| 183 | ocsp_prn.o: ocsp_prn.c | ||
| 184 | ocsp_srv.o: ../../e_os.h ../../include/openssl/asn1.h | ||
| 185 | ocsp_srv.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | ||
| 186 | ocsp_srv.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h | ||
| 187 | ocsp_srv.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h | ||
| 188 | ocsp_srv.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h | ||
| 189 | ocsp_srv.o: ../../include/openssl/err.h ../../include/openssl/evp.h | ||
| 190 | ocsp_srv.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | ||
| 191 | ocsp_srv.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h | ||
| 192 | ocsp_srv.o: ../../include/openssl/opensslconf.h | ||
| 193 | ocsp_srv.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 194 | ocsp_srv.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h | ||
| 195 | ocsp_srv.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h | ||
| 196 | ocsp_srv.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | ||
| 197 | ocsp_srv.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 198 | ocsp_srv.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h | ||
| 199 | ocsp_srv.o: ../../include/openssl/x509v3.h ../cryptlib.h ocsp_srv.c | ||
| 200 | ocsp_vfy.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | ||
| 201 | ocsp_vfy.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h | ||
| 202 | ocsp_vfy.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | ||
| 203 | ocsp_vfy.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h | ||
| 204 | ocsp_vfy.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h | ||
| 205 | ocsp_vfy.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h | ||
| 206 | ocsp_vfy.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | ||
| 207 | ocsp_vfy.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h | ||
| 208 | ocsp_vfy.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 209 | ocsp_vfy.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h | ||
| 210 | ocsp_vfy.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | ||
| 211 | ocsp_vfy.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h | ||
| 212 | ocsp_vfy.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h | ||
| 213 | ocsp_vfy.o: ocsp_vfy.c | ||
diff --git a/src/lib/libcrypto/ocsp/ocsp_vfy.c b/src/lib/libcrypto/ocsp/ocsp_vfy.c index 276718304d..91a45c9133 100644 --- a/src/lib/libcrypto/ocsp/ocsp_vfy.c +++ b/src/lib/libcrypto/ocsp/ocsp_vfy.c | |||
| @@ -111,7 +111,6 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs, | |||
| 111 | init_res = X509_STORE_CTX_init(&ctx, st, signer, bs->certs); | 111 | init_res = X509_STORE_CTX_init(&ctx, st, signer, bs->certs); |
| 112 | if(!init_res) | 112 | if(!init_res) |
| 113 | { | 113 | { |
| 114 | ret = -1; | ||
| 115 | OCSPerr(OCSP_F_OCSP_BASIC_VERIFY,ERR_R_X509_LIB); | 114 | OCSPerr(OCSP_F_OCSP_BASIC_VERIFY,ERR_R_X509_LIB); |
| 116 | goto end; | 115 | goto end; |
| 117 | } | 116 | } |
