diff options
| author | deraadt <> | 2014-06-07 15:06:24 +0000 |
|---|---|---|
| committer | deraadt <> | 2014-06-07 15:06:24 +0000 |
| commit | 9c53764a0ba4c6e9262d0f1609e2b5f26d82e845 (patch) | |
| tree | 8c109a1ee473f778c99439e5209def2f14539e9f /src/lib/libcrypto/pkcs7 | |
| parent | f43ea7a8b36a855d94df48cdbc5ae25525d67207 (diff) | |
| download | openbsd-9c53764a0ba4c6e9262d0f1609e2b5f26d82e845.tar.gz openbsd-9c53764a0ba4c6e9262d0f1609e2b5f26d82e845.tar.bz2 openbsd-9c53764a0ba4c6e9262d0f1609e2b5f26d82e845.zip | |
Remove various test stubs. The good ones have been moved by jsing
and others to the regress framework. These remaining ones just
muddle us up when re-reading code repeatedly.
ok jsing
Diffstat (limited to 'src/lib/libcrypto/pkcs7')
| -rw-r--r-- | src/lib/libcrypto/pkcs7/dec.c | 248 | ||||
| -rw-r--r-- | src/lib/libcrypto/pkcs7/enc.c | 174 | ||||
| -rw-r--r-- | src/lib/libcrypto/pkcs7/sign.c | 151 | ||||
| -rw-r--r-- | src/lib/libcrypto/pkcs7/verify.c | 260 |
4 files changed, 0 insertions, 833 deletions
diff --git a/src/lib/libcrypto/pkcs7/dec.c b/src/lib/libcrypto/pkcs7/dec.c deleted file mode 100644 index 6752ec568a..0000000000 --- a/src/lib/libcrypto/pkcs7/dec.c +++ /dev/null | |||
| @@ -1,248 +0,0 @@ | |||
| 1 | /* crypto/pkcs7/verify.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | #include <stdio.h> | ||
| 59 | #include <stdlib.h> | ||
| 60 | #include <string.h> | ||
| 61 | #include <openssl/bio.h> | ||
| 62 | #include <openssl/x509.h> | ||
| 63 | #include <openssl/pem.h> | ||
| 64 | #include <openssl/err.h> | ||
| 65 | #include <openssl/asn1.h> | ||
| 66 | |||
| 67 | int verify_callback(int ok, X509_STORE_CTX *ctx); | ||
| 68 | |||
| 69 | BIO *bio_err=NULL; | ||
| 70 | |||
| 71 | int main(argc,argv) | ||
| 72 | int argc; | ||
| 73 | char *argv[]; | ||
| 74 | { | ||
| 75 | char *keyfile=NULL; | ||
| 76 | BIO *in; | ||
| 77 | EVP_PKEY *pkey; | ||
| 78 | X509 *x509; | ||
| 79 | PKCS7 *p7; | ||
| 80 | PKCS7_SIGNER_INFO *si; | ||
| 81 | X509_STORE_CTX cert_ctx; | ||
| 82 | X509_STORE *cert_store=NULL; | ||
| 83 | BIO *data,*detached=NULL,*p7bio=NULL; | ||
| 84 | char buf[1024*4]; | ||
| 85 | unsigned char *pp; | ||
| 86 | int i,printit=0; | ||
| 87 | STACK_OF(PKCS7_SIGNER_INFO) *sk; | ||
| 88 | |||
| 89 | OpenSSL_add_all_algorithms(); | ||
| 90 | bio_err=BIO_new_fp(stderr,BIO_NOCLOSE); | ||
| 91 | |||
| 92 | data=BIO_new(BIO_s_file()); | ||
| 93 | pp=NULL; | ||
| 94 | while (argc > 1) | ||
| 95 | { | ||
| 96 | argc--; | ||
| 97 | argv++; | ||
| 98 | if (strcmp(argv[0],"-p") == 0) | ||
| 99 | { | ||
| 100 | printit=1; | ||
| 101 | } | ||
| 102 | else if ((strcmp(argv[0],"-k") == 0) && (argc >= 2)) { | ||
| 103 | keyfile = argv[1]; | ||
| 104 | argc-=1; | ||
| 105 | argv+=1; | ||
| 106 | } else if ((strcmp(argv[0],"-d") == 0) && (argc >= 2)) | ||
| 107 | { | ||
| 108 | detached=BIO_new(BIO_s_file()); | ||
| 109 | if (!BIO_read_filename(detached,argv[1])) | ||
| 110 | goto err; | ||
| 111 | argc-=1; | ||
| 112 | argv+=1; | ||
| 113 | } | ||
| 114 | else break; | ||
| 115 | } | ||
| 116 | |||
| 117 | if (!BIO_read_filename(data,argv[0])) goto err; | ||
| 118 | |||
| 119 | if(!keyfile) { | ||
| 120 | fprintf(stderr, "No private key file specified\n"); | ||
| 121 | goto err; | ||
| 122 | } | ||
| 123 | |||
| 124 | if ((in=BIO_new_file(keyfile,"r")) == NULL) goto err; | ||
| 125 | if ((x509=PEM_read_bio_X509(in,NULL,NULL,NULL)) == NULL) goto err; | ||
| 126 | BIO_reset(in); | ||
| 127 | if ((pkey=PEM_read_bio_PrivateKey(in,NULL,NULL,NULL)) == NULL) | ||
| 128 | goto err; | ||
| 129 | BIO_free(in); | ||
| 130 | |||
| 131 | if (pp == NULL) | ||
| 132 | BIO_set_fp(data,stdin,BIO_NOCLOSE); | ||
| 133 | |||
| 134 | |||
| 135 | /* Load the PKCS7 object from a file */ | ||
| 136 | if ((p7=PEM_read_bio_PKCS7(data,NULL,NULL,NULL)) == NULL) goto err; | ||
| 137 | |||
| 138 | |||
| 139 | |||
| 140 | /* This stuff is being setup for certificate verification. | ||
| 141 | * When using SSL, it could be replaced with a | ||
| 142 | * cert_stre=SSL_CTX_get_cert_store(ssl_ctx); */ | ||
| 143 | cert_store=X509_STORE_new(); | ||
| 144 | X509_STORE_set_default_paths(cert_store); | ||
| 145 | X509_STORE_load_locations(cert_store,NULL,"../../certs"); | ||
| 146 | X509_STORE_set_verify_cb_func(cert_store,verify_callback); | ||
| 147 | |||
| 148 | ERR_clear_error(); | ||
| 149 | |||
| 150 | /* We need to process the data */ | ||
| 151 | /* We cannot support detached encryption */ | ||
| 152 | p7bio=PKCS7_dataDecode(p7,pkey,detached,x509); | ||
| 153 | |||
| 154 | if (p7bio == NULL) | ||
| 155 | { | ||
| 156 | printf("problems decoding\n"); | ||
| 157 | goto err; | ||
| 158 | } | ||
| 159 | |||
| 160 | /* We now have to 'read' from p7bio to calculate digests etc. */ | ||
| 161 | for (;;) | ||
| 162 | { | ||
| 163 | i=BIO_read(p7bio,buf,sizeof(buf)); | ||
| 164 | /* print it? */ | ||
| 165 | if (i <= 0) break; | ||
| 166 | fwrite(buf,1, i, stdout); | ||
| 167 | } | ||
| 168 | |||
| 169 | /* We can now verify signatures */ | ||
| 170 | sk=PKCS7_get_signer_info(p7); | ||
| 171 | if (sk == NULL) | ||
| 172 | { | ||
| 173 | fprintf(stderr, "there are no signatures on this data\n"); | ||
| 174 | } | ||
| 175 | else | ||
| 176 | { | ||
| 177 | /* Ok, first we need to, for each subject entry, | ||
| 178 | * see if we can verify */ | ||
| 179 | ERR_clear_error(); | ||
| 180 | for (i=0; i<sk_PKCS7_SIGNER_INFO_num(sk); i++) | ||
| 181 | { | ||
| 182 | si=sk_PKCS7_SIGNER_INFO_value(sk,i); | ||
| 183 | i=PKCS7_dataVerify(cert_store,&cert_ctx,p7bio,p7,si); | ||
| 184 | if (i <= 0) | ||
| 185 | goto err; | ||
| 186 | else | ||
| 187 | fprintf(stderr,"Signature verified\n"); | ||
| 188 | } | ||
| 189 | } | ||
| 190 | X509_STORE_free(cert_store); | ||
| 191 | |||
| 192 | exit(0); | ||
| 193 | err: | ||
| 194 | ERR_load_crypto_strings(); | ||
| 195 | ERR_print_errors_fp(stderr); | ||
| 196 | exit(1); | ||
| 197 | } | ||
| 198 | |||
| 199 | /* should be X509 * but we can just have them as char *. */ | ||
| 200 | int verify_callback(int ok, X509_STORE_CTX *ctx) | ||
| 201 | { | ||
| 202 | char buf[256]; | ||
| 203 | X509 *err_cert; | ||
| 204 | int err,depth; | ||
| 205 | |||
| 206 | err_cert=X509_STORE_CTX_get_current_cert(ctx); | ||
| 207 | err= X509_STORE_CTX_get_error(ctx); | ||
| 208 | depth= X509_STORE_CTX_get_error_depth(ctx); | ||
| 209 | |||
| 210 | X509_NAME_oneline(X509_get_subject_name(err_cert),buf,256); | ||
| 211 | BIO_printf(bio_err,"depth=%d %s\n",depth,buf); | ||
| 212 | if (!ok) | ||
| 213 | { | ||
| 214 | BIO_printf(bio_err,"verify error:num=%d:%s\n",err, | ||
| 215 | X509_verify_cert_error_string(err)); | ||
| 216 | if (depth < 6) | ||
| 217 | { | ||
| 218 | ok=1; | ||
| 219 | X509_STORE_CTX_set_error(ctx,X509_V_OK); | ||
| 220 | } | ||
| 221 | else | ||
| 222 | { | ||
| 223 | ok=0; | ||
| 224 | X509_STORE_CTX_set_error(ctx,X509_V_ERR_CERT_CHAIN_TOO_LONG); | ||
| 225 | } | ||
| 226 | } | ||
| 227 | switch (ctx->error) | ||
| 228 | { | ||
| 229 | case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT: | ||
| 230 | X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert),buf,256); | ||
| 231 | BIO_printf(bio_err,"issuer= %s\n",buf); | ||
| 232 | break; | ||
| 233 | case X509_V_ERR_CERT_NOT_YET_VALID: | ||
| 234 | case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD: | ||
| 235 | BIO_printf(bio_err,"notBefore="); | ||
| 236 | ASN1_UTCTIME_print(bio_err,X509_get_notBefore(ctx->current_cert)); | ||
| 237 | BIO_printf(bio_err,"\n"); | ||
| 238 | break; | ||
| 239 | case X509_V_ERR_CERT_HAS_EXPIRED: | ||
| 240 | case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD: | ||
| 241 | BIO_printf(bio_err,"notAfter="); | ||
| 242 | ASN1_UTCTIME_print(bio_err,X509_get_notAfter(ctx->current_cert)); | ||
| 243 | BIO_printf(bio_err,"\n"); | ||
| 244 | break; | ||
| 245 | } | ||
| 246 | BIO_printf(bio_err,"verify return:%d\n",ok); | ||
| 247 | return(ok); | ||
| 248 | } | ||
diff --git a/src/lib/libcrypto/pkcs7/enc.c b/src/lib/libcrypto/pkcs7/enc.c deleted file mode 100644 index 7417f8a4e0..0000000000 --- a/src/lib/libcrypto/pkcs7/enc.c +++ /dev/null | |||
| @@ -1,174 +0,0 @@ | |||
| 1 | /* crypto/pkcs7/enc.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | #include <stdio.h> | ||
| 59 | #include <string.h> | ||
| 60 | #include <openssl/bio.h> | ||
| 61 | #include <openssl/x509.h> | ||
| 62 | #include <openssl/pem.h> | ||
| 63 | #include <openssl/err.h> | ||
| 64 | |||
| 65 | int main(argc,argv) | ||
| 66 | int argc; | ||
| 67 | char *argv[]; | ||
| 68 | { | ||
| 69 | X509 *x509; | ||
| 70 | PKCS7 *p7; | ||
| 71 | BIO *in; | ||
| 72 | BIO *data,*p7bio; | ||
| 73 | char buf[1024*4]; | ||
| 74 | int i; | ||
| 75 | int nodetach=1; | ||
| 76 | char *keyfile = NULL; | ||
| 77 | const EVP_CIPHER *cipher=NULL; | ||
| 78 | STACK_OF(X509) *recips=NULL; | ||
| 79 | |||
| 80 | OpenSSL_add_all_algorithms(); | ||
| 81 | |||
| 82 | data=BIO_new(BIO_s_file()); | ||
| 83 | while(argc > 1) | ||
| 84 | { | ||
| 85 | if (strcmp(argv[1],"-nd") == 0) | ||
| 86 | { | ||
| 87 | nodetach=1; | ||
| 88 | argv++; argc--; | ||
| 89 | } | ||
| 90 | else if ((strcmp(argv[1],"-c") == 0) && (argc >= 2)) { | ||
| 91 | if(!(cipher = EVP_get_cipherbyname(argv[2]))) { | ||
| 92 | fprintf(stderr, "Unknown cipher %s\n", argv[2]); | ||
| 93 | goto err; | ||
| 94 | } | ||
| 95 | argc-=2; | ||
| 96 | argv+=2; | ||
| 97 | } else if ((strcmp(argv[1],"-k") == 0) && (argc >= 2)) { | ||
| 98 | keyfile = argv[2]; | ||
| 99 | argc-=2; | ||
| 100 | argv+=2; | ||
| 101 | if (!(in=BIO_new_file(keyfile,"r"))) goto err; | ||
| 102 | if (!(x509=PEM_read_bio_X509(in,NULL,NULL,NULL))) | ||
| 103 | goto err; | ||
| 104 | if(!recips) recips = sk_X509_new_null(); | ||
| 105 | sk_X509_push(recips, x509); | ||
| 106 | BIO_free(in); | ||
| 107 | } else break; | ||
| 108 | } | ||
| 109 | |||
| 110 | if(!recips) { | ||
| 111 | fprintf(stderr, "No recipients\n"); | ||
| 112 | goto err; | ||
| 113 | } | ||
| 114 | |||
| 115 | if (!BIO_read_filename(data,argv[1])) goto err; | ||
| 116 | |||
| 117 | p7=PKCS7_new(); | ||
| 118 | #if 0 | ||
| 119 | BIO_reset(in); | ||
| 120 | if ((pkey=PEM_read_bio_PrivateKey(in,NULL,NULL)) == NULL) goto err; | ||
| 121 | BIO_free(in); | ||
| 122 | PKCS7_set_type(p7,NID_pkcs7_signedAndEnveloped); | ||
| 123 | |||
| 124 | if (PKCS7_add_signature(p7,x509,pkey,EVP_sha1()) == NULL) goto err; | ||
| 125 | /* we may want to add more */ | ||
| 126 | PKCS7_add_certificate(p7,x509); | ||
| 127 | #else | ||
| 128 | PKCS7_set_type(p7,NID_pkcs7_enveloped); | ||
| 129 | #endif | ||
| 130 | if(!cipher) { | ||
| 131 | #ifndef OPENSSL_NO_DES | ||
| 132 | cipher = EVP_des_ede3_cbc(); | ||
| 133 | #else | ||
| 134 | fprintf(stderr, "No cipher selected\n"); | ||
| 135 | goto err; | ||
| 136 | #endif | ||
| 137 | } | ||
| 138 | |||
| 139 | if (!PKCS7_set_cipher(p7,cipher)) goto err; | ||
| 140 | for(i = 0; i < sk_X509_num(recips); i++) { | ||
| 141 | if (!PKCS7_add_recipient(p7,sk_X509_value(recips, i))) goto err; | ||
| 142 | } | ||
| 143 | sk_X509_pop_free(recips, X509_free); | ||
| 144 | |||
| 145 | /* Set the content of the signed to 'data' */ | ||
| 146 | /* PKCS7_content_new(p7,NID_pkcs7_data); not used in envelope */ | ||
| 147 | |||
| 148 | /* could be used, but not in this version :-) | ||
| 149 | if (!nodetach) PKCS7_set_detached(p7,1); | ||
| 150 | */ | ||
| 151 | |||
| 152 | if ((p7bio=PKCS7_dataInit(p7,NULL)) == NULL) goto err; | ||
| 153 | |||
| 154 | for (;;) | ||
| 155 | { | ||
| 156 | i=BIO_read(data,buf,sizeof(buf)); | ||
| 157 | if (i <= 0) break; | ||
| 158 | BIO_write(p7bio,buf,i); | ||
| 159 | } | ||
| 160 | BIO_flush(p7bio); | ||
| 161 | |||
| 162 | if (!PKCS7_dataFinal(p7,p7bio)) goto err; | ||
| 163 | BIO_free(p7bio); | ||
| 164 | |||
| 165 | PEM_write_PKCS7(stdout,p7); | ||
| 166 | PKCS7_free(p7); | ||
| 167 | |||
| 168 | exit(0); | ||
| 169 | err: | ||
| 170 | ERR_load_crypto_strings(); | ||
| 171 | ERR_print_errors_fp(stderr); | ||
| 172 | exit(1); | ||
| 173 | } | ||
| 174 | |||
diff --git a/src/lib/libcrypto/pkcs7/sign.c b/src/lib/libcrypto/pkcs7/sign.c deleted file mode 100644 index 43168514f9..0000000000 --- a/src/lib/libcrypto/pkcs7/sign.c +++ /dev/null | |||
| @@ -1,151 +0,0 @@ | |||
| 1 | /* crypto/pkcs7/sign.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | #include <stdio.h> | ||
| 59 | #include <string.h> | ||
| 60 | #include <openssl/bio.h> | ||
| 61 | #include <openssl/x509.h> | ||
| 62 | #include <openssl/pem.h> | ||
| 63 | #include <openssl/err.h> | ||
| 64 | |||
| 65 | int main(argc,argv) | ||
| 66 | int argc; | ||
| 67 | char *argv[]; | ||
| 68 | { | ||
| 69 | X509 *x509; | ||
| 70 | EVP_PKEY *pkey; | ||
| 71 | PKCS7 *p7; | ||
| 72 | PKCS7_SIGNER_INFO *si; | ||
| 73 | BIO *in; | ||
| 74 | BIO *data,*p7bio; | ||
| 75 | char buf[1024*4]; | ||
| 76 | int i; | ||
| 77 | int nodetach=0; | ||
| 78 | |||
| 79 | #ifndef OPENSSL_NO_MD5 | ||
| 80 | EVP_add_digest(EVP_md5()); | ||
| 81 | #endif | ||
| 82 | #ifndef OPENSSL_NO_SHA1 | ||
| 83 | EVP_add_digest(EVP_sha1()); | ||
| 84 | #endif | ||
| 85 | #ifndef OPENSSL_NO_MDC2 | ||
| 86 | EVP_add_digest(EVP_mdc2()); | ||
| 87 | #endif | ||
| 88 | |||
| 89 | data=BIO_new(BIO_s_file()); | ||
| 90 | again: | ||
| 91 | if (argc > 1) | ||
| 92 | { | ||
| 93 | if (strcmp(argv[1],"-nd") == 0) | ||
| 94 | { | ||
| 95 | nodetach=1; | ||
| 96 | argv++; argc--; | ||
| 97 | goto again; | ||
| 98 | } | ||
| 99 | if (!BIO_read_filename(data,argv[1])) | ||
| 100 | goto err; | ||
| 101 | } | ||
| 102 | else | ||
| 103 | BIO_set_fp(data,stdin,BIO_NOCLOSE); | ||
| 104 | |||
| 105 | if ((in=BIO_new_file("server.pem","r")) == NULL) goto err; | ||
| 106 | if ((x509=PEM_read_bio_X509(in,NULL,NULL,NULL)) == NULL) goto err; | ||
| 107 | BIO_reset(in); | ||
| 108 | if ((pkey=PEM_read_bio_PrivateKey(in,NULL,NULL,NULL)) == NULL) goto err; | ||
| 109 | BIO_free(in); | ||
| 110 | |||
| 111 | p7=PKCS7_new(); | ||
| 112 | PKCS7_set_type(p7,NID_pkcs7_signed); | ||
| 113 | |||
| 114 | si=PKCS7_add_signature(p7,x509,pkey,EVP_sha1()); | ||
| 115 | if (si == NULL) goto err; | ||
| 116 | |||
| 117 | /* If you do this then you get signing time automatically added */ | ||
| 118 | PKCS7_add_signed_attribute(si, NID_pkcs9_contentType, V_ASN1_OBJECT, | ||
| 119 | OBJ_nid2obj(NID_pkcs7_data)); | ||
| 120 | |||
| 121 | /* we may want to add more */ | ||
| 122 | PKCS7_add_certificate(p7,x509); | ||
| 123 | |||
| 124 | /* Set the content of the signed to 'data' */ | ||
| 125 | PKCS7_content_new(p7,NID_pkcs7_data); | ||
| 126 | |||
| 127 | if (!nodetach) | ||
| 128 | PKCS7_set_detached(p7,1); | ||
| 129 | |||
| 130 | if ((p7bio=PKCS7_dataInit(p7,NULL)) == NULL) goto err; | ||
| 131 | |||
| 132 | for (;;) | ||
| 133 | { | ||
| 134 | i=BIO_read(data,buf,sizeof(buf)); | ||
| 135 | if (i <= 0) break; | ||
| 136 | BIO_write(p7bio,buf,i); | ||
| 137 | } | ||
| 138 | |||
| 139 | if (!PKCS7_dataFinal(p7,p7bio)) goto err; | ||
| 140 | BIO_free(p7bio); | ||
| 141 | |||
| 142 | PEM_write_PKCS7(stdout,p7); | ||
| 143 | PKCS7_free(p7); | ||
| 144 | |||
| 145 | exit(0); | ||
| 146 | err: | ||
| 147 | ERR_load_crypto_strings(); | ||
| 148 | ERR_print_errors_fp(stderr); | ||
| 149 | exit(1); | ||
| 150 | } | ||
| 151 | |||
diff --git a/src/lib/libcrypto/pkcs7/verify.c b/src/lib/libcrypto/pkcs7/verify.c deleted file mode 100644 index 414f985dc2..0000000000 --- a/src/lib/libcrypto/pkcs7/verify.c +++ /dev/null | |||
| @@ -1,260 +0,0 @@ | |||
| 1 | /* crypto/pkcs7/verify.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | #include <stdio.h> | ||
| 59 | #include <string.h> | ||
| 60 | #include <openssl/bio.h> | ||
| 61 | #include <openssl/asn1.h> | ||
| 62 | #include <openssl/x509.h> | ||
| 63 | #include <openssl/pem.h> | ||
| 64 | #include <openssl/err.h> | ||
| 65 | #include "example.h" | ||
| 66 | |||
| 67 | int verify_callback(int ok, X509_STORE_CTX *ctx); | ||
| 68 | |||
| 69 | BIO *bio_err=NULL; | ||
| 70 | BIO *bio_out=NULL; | ||
| 71 | |||
| 72 | int main(argc,argv) | ||
| 73 | int argc; | ||
| 74 | char *argv[]; | ||
| 75 | { | ||
| 76 | PKCS7 *p7; | ||
| 77 | PKCS7_SIGNER_INFO *si; | ||
| 78 | X509_STORE_CTX cert_ctx; | ||
| 79 | X509_STORE *cert_store=NULL; | ||
| 80 | BIO *data,*detached=NULL,*p7bio=NULL; | ||
| 81 | char buf[1024*4]; | ||
| 82 | char *pp; | ||
| 83 | int i,printit=0; | ||
| 84 | STACK_OF(PKCS7_SIGNER_INFO) *sk; | ||
| 85 | |||
| 86 | bio_err=BIO_new_fp(stderr,BIO_NOCLOSE); | ||
| 87 | bio_out=BIO_new_fp(stdout,BIO_NOCLOSE); | ||
| 88 | #ifndef OPENSSL_NO_MD5 | ||
| 89 | EVP_add_digest(EVP_md5()); | ||
| 90 | #endif | ||
| 91 | #ifndef OPENSSL_NO_SHA1 | ||
| 92 | EVP_add_digest(EVP_sha1()); | ||
| 93 | #endif | ||
| 94 | #ifndef OPENSSL_NO_MDC2 | ||
| 95 | EVP_add_digest(EVP_mdc2()); | ||
| 96 | #endif | ||
| 97 | |||
| 98 | data=BIO_new(BIO_s_file()); | ||
| 99 | |||
| 100 | pp=NULL; | ||
| 101 | while (argc > 1) | ||
| 102 | { | ||
| 103 | argc--; | ||
| 104 | argv++; | ||
| 105 | if (strcmp(argv[0],"-p") == 0) | ||
| 106 | { | ||
| 107 | printit=1; | ||
| 108 | } | ||
| 109 | else if ((strcmp(argv[0],"-d") == 0) && (argc >= 2)) | ||
| 110 | { | ||
| 111 | detached=BIO_new(BIO_s_file()); | ||
| 112 | if (!BIO_read_filename(detached,argv[1])) | ||
| 113 | goto err; | ||
| 114 | argc--; | ||
| 115 | argv++; | ||
| 116 | } | ||
| 117 | else | ||
| 118 | { | ||
| 119 | pp=argv[0]; | ||
| 120 | if (!BIO_read_filename(data,argv[0])) | ||
| 121 | goto err; | ||
| 122 | } | ||
| 123 | } | ||
| 124 | |||
| 125 | if (pp == NULL) | ||
| 126 | BIO_set_fp(data,stdin,BIO_NOCLOSE); | ||
| 127 | |||
| 128 | |||
| 129 | /* Load the PKCS7 object from a file */ | ||
| 130 | if ((p7=PEM_read_bio_PKCS7(data,NULL,NULL,NULL)) == NULL) goto err; | ||
| 131 | |||
| 132 | /* This stuff is being setup for certificate verification. | ||
| 133 | * When using SSL, it could be replaced with a | ||
| 134 | * cert_stre=SSL_CTX_get_cert_store(ssl_ctx); */ | ||
| 135 | cert_store=X509_STORE_new(); | ||
| 136 | X509_STORE_set_default_paths(cert_store); | ||
| 137 | X509_STORE_load_locations(cert_store,NULL,"../../certs"); | ||
| 138 | X509_STORE_set_verify_cb_func(cert_store,verify_callback); | ||
| 139 | |||
| 140 | ERR_clear_error(); | ||
| 141 | |||
| 142 | /* We need to process the data */ | ||
| 143 | if ((PKCS7_get_detached(p7) || detached)) | ||
| 144 | { | ||
| 145 | if (detached == NULL) | ||
| 146 | { | ||
| 147 | printf("no data to verify the signature on\n"); | ||
| 148 | exit(1); | ||
| 149 | } | ||
| 150 | else | ||
| 151 | p7bio=PKCS7_dataInit(p7,detached); | ||
| 152 | } | ||
| 153 | else | ||
| 154 | { | ||
| 155 | p7bio=PKCS7_dataInit(p7,NULL); | ||
| 156 | } | ||
| 157 | |||
| 158 | /* We now have to 'read' from p7bio to calculate digests etc. */ | ||
| 159 | for (;;) | ||
| 160 | { | ||
| 161 | i=BIO_read(p7bio,buf,sizeof(buf)); | ||
| 162 | /* print it? */ | ||
| 163 | if (i <= 0) break; | ||
| 164 | } | ||
| 165 | |||
| 166 | /* We can now verify signatures */ | ||
| 167 | sk=PKCS7_get_signer_info(p7); | ||
| 168 | if (sk == NULL) | ||
| 169 | { | ||
| 170 | printf("there are no signatures on this data\n"); | ||
| 171 | exit(1); | ||
| 172 | } | ||
| 173 | |||
| 174 | /* Ok, first we need to, for each subject entry, see if we can verify */ | ||
| 175 | for (i=0; i<sk_PKCS7_SIGNER_INFO_num(sk); i++) | ||
| 176 | { | ||
| 177 | ASN1_UTCTIME *tm; | ||
| 178 | char *str1,*str2; | ||
| 179 | int rc; | ||
| 180 | |||
| 181 | si=sk_PKCS7_SIGNER_INFO_value(sk,i); | ||
| 182 | rc=PKCS7_dataVerify(cert_store,&cert_ctx,p7bio,p7,si); | ||
| 183 | if (rc <= 0) | ||
| 184 | goto err; | ||
| 185 | printf("signer info\n"); | ||
| 186 | if ((tm=get_signed_time(si)) != NULL) | ||
| 187 | { | ||
| 188 | BIO_printf(bio_out,"Signed time:"); | ||
| 189 | ASN1_UTCTIME_print(bio_out,tm); | ||
| 190 | ASN1_UTCTIME_free(tm); | ||
| 191 | BIO_printf(bio_out,"\n"); | ||
| 192 | } | ||
| 193 | if (get_signed_seq2string(si,&str1,&str2)) | ||
| 194 | { | ||
| 195 | BIO_printf(bio_out,"String 1 is %s\n",str1); | ||
| 196 | BIO_printf(bio_out,"String 2 is %s\n",str2); | ||
| 197 | } | ||
| 198 | |||
| 199 | } | ||
| 200 | |||
| 201 | X509_STORE_free(cert_store); | ||
| 202 | |||
| 203 | printf("done\n"); | ||
| 204 | exit(0); | ||
| 205 | err: | ||
| 206 | ERR_load_crypto_strings(); | ||
| 207 | ERR_print_errors_fp(stderr); | ||
| 208 | exit(1); | ||
| 209 | } | ||
| 210 | |||
| 211 | /* should be X509 * but we can just have them as char *. */ | ||
| 212 | int verify_callback(int ok, X509_STORE_CTX *ctx) | ||
| 213 | { | ||
| 214 | char buf[256]; | ||
| 215 | X509 *err_cert; | ||
| 216 | int err,depth; | ||
| 217 | |||
| 218 | err_cert=X509_STORE_CTX_get_current_cert(ctx); | ||
| 219 | err= X509_STORE_CTX_get_error(ctx); | ||
| 220 | depth= X509_STORE_CTX_get_error_depth(ctx); | ||
| 221 | |||
| 222 | X509_NAME_oneline(X509_get_subject_name(err_cert),buf,256); | ||
| 223 | BIO_printf(bio_err,"depth=%d %s\n",depth,buf); | ||
| 224 | if (!ok) | ||
| 225 | { | ||
| 226 | BIO_printf(bio_err,"verify error:num=%d:%s\n",err, | ||
| 227 | X509_verify_cert_error_string(err)); | ||
| 228 | if (depth < 6) | ||
| 229 | { | ||
| 230 | ok=1; | ||
| 231 | X509_STORE_CTX_set_error(ctx,X509_V_OK); | ||
| 232 | } | ||
| 233 | else | ||
| 234 | { | ||
| 235 | ok=0; | ||
| 236 | X509_STORE_CTX_set_error(ctx,X509_V_ERR_CERT_CHAIN_TOO_LONG); | ||
| 237 | } | ||
| 238 | } | ||
| 239 | switch (ctx->error) | ||
| 240 | { | ||
| 241 | case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT: | ||
| 242 | X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert),buf,256); | ||
| 243 | BIO_printf(bio_err,"issuer= %s\n",buf); | ||
| 244 | break; | ||
| 245 | case X509_V_ERR_CERT_NOT_YET_VALID: | ||
| 246 | case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD: | ||
| 247 | BIO_printf(bio_err,"notBefore="); | ||
| 248 | ASN1_UTCTIME_print(bio_err,X509_get_notBefore(ctx->current_cert)); | ||
| 249 | BIO_printf(bio_err,"\n"); | ||
| 250 | break; | ||
| 251 | case X509_V_ERR_CERT_HAS_EXPIRED: | ||
| 252 | case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD: | ||
| 253 | BIO_printf(bio_err,"notAfter="); | ||
| 254 | ASN1_UTCTIME_print(bio_err,X509_get_notAfter(ctx->current_cert)); | ||
| 255 | BIO_printf(bio_err,"\n"); | ||
| 256 | break; | ||
| 257 | } | ||
| 258 | BIO_printf(bio_err,"verify return:%d\n",ok); | ||
| 259 | return(ok); | ||
| 260 | } | ||
