[BACK]Return to apps.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / openssl

Diff for /src/usr.bin/openssl/apps.h between version 1.14 and 1.15

version 1.14, 2015/07/15 13:54:34 version 1.15, 2015/09/11 14:30:23
Line 121 
Line 121 
 #include <openssl/txt_db.h>  #include <openssl/txt_db.h>
 #include <openssl/x509.h>  #include <openssl/x509.h>
   
 #ifndef OPENSSL_NO_ENGINE  
 #include <openssl/engine.h>  
 #endif  
   
 #ifndef OPENSSL_NO_OCSP  #ifndef OPENSSL_NO_OCSP
 #include <openssl/ocsp.h>  #include <openssl/ocsp.h>
 #endif  #endif
Line 166 
Line 162 
 int app_passwd(BIO *err, char *arg1, char *arg2, char **pass1, char **pass2);  int app_passwd(BIO *err, char *arg1, char *arg2, char **pass1, char **pass2);
 int add_oid_section(BIO *err, CONF *conf);  int add_oid_section(BIO *err, CONF *conf);
 X509 *load_cert(BIO *err, const char *file, int format,  X509 *load_cert(BIO *err, const char *file, int format,
     const char *pass, ENGINE *e, const char *cert_descrip);      const char *pass, const char *cert_descrip);
 EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,  EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
     const char *pass, ENGINE *e, const char *key_descrip);      const char *pass, const char *key_descrip);
 EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin,  EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin,
     const char *pass, ENGINE *e, const char *key_descrip);      const char *pass, const char *key_descrip);
 STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,  STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
     const char *pass, ENGINE *e, const char *cert_descrip);      const char *pass, const char *cert_descrip);
 STACK_OF(X509_CRL) *load_crls(BIO *err, const char *file, int format,  STACK_OF(X509_CRL) *load_crls(BIO *err, const char *file, int format,
     const char *pass, ENGINE *e, const char *cert_descrip);      const char *pass, const char *cert_descrip);
 X509_STORE *setup_verify(BIO *bp, char *CAfile, char *CApath);  X509_STORE *setup_verify(BIO *bp, char *CAfile, char *CApath);
 #ifndef OPENSSL_NO_ENGINE  
 ENGINE *setup_engine(BIO *err, const char *engine, int debug);  
 #endif  
   
 #ifndef OPENSSL_NO_OCSP  #ifndef OPENSSL_NO_OCSP
 OCSP_RESPONSE *process_responder(BIO *err, OCSP_REQUEST *req,  OCSP_RESPONSE *process_responder(BIO *err, OCSP_REQUEST *req,
Line 236 
Line 229 
 void policies_print(BIO *out, X509_STORE_CTX *ctx);  void policies_print(BIO *out, X509_STORE_CTX *ctx);
 int bio_to_mem(unsigned char **out, int maxlen, BIO *in);  int bio_to_mem(unsigned char **out, int maxlen, BIO *in);
 int pkey_ctrl_string(EVP_PKEY_CTX *ctx, char *value);  int pkey_ctrl_string(EVP_PKEY_CTX *ctx, char *value);
 int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx, const char *algname, ENGINE *e,  int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx, const char *algname,
     int do_param);      int do_param);
 int do_X509_sign(BIO *err, X509 *x, EVP_PKEY *pkey, const EVP_MD *md,  int do_X509_sign(BIO *err, X509 *x, EVP_PKEY *pkey, const EVP_MD *md,
     STACK_OF(OPENSSL_STRING) *sigopts);      STACK_OF(OPENSSL_STRING) *sigopts);
Line 254 
Line 247 
 #define FORMAT_NETSCAPE 4  #define FORMAT_NETSCAPE 4
 #define FORMAT_PKCS12   5  #define FORMAT_PKCS12   5
 #define FORMAT_SMIME    6  #define FORMAT_SMIME    6
 #define FORMAT_ENGINE   7  
 #define FORMAT_IISSGC   8       /* XXX this stupid macro helps us to avoid  #define FORMAT_IISSGC   8       /* XXX this stupid macro helps us to avoid
                                  * adding yet another param to load_*key() */                                   * adding yet another param to load_*key() */
 #define FORMAT_PEMRSA   9       /* PEM RSAPubicKey format */  #define FORMAT_PEMRSA   9       /* PEM RSAPubicKey format */

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15