Ignore:
Timestamp:
Feb 7, 2019, 8:36:33 AM (5 years ago)
Author:
coas-nagasima
Message:

wolfsslを3.15.7にバージョンアップ

File:
1 edited

Legend:

Unmodified
Added
Removed

  • asp3_tinet_ecnl_rx/trunk/wolfssl-3.12.2/wolfssl/openssl/pem.h

    r337 r372  
     1/* pem.h
     2 *
     3 * Copyright (C) 2006-2017 wolfSSL Inc.
     4 *
     5 * This file is part of wolfSSL.
     6 *
     7 * wolfSSL is free software; you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation; either version 2 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * wolfSSL is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with this program; if not, write to the Free Software
     19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
     20 */
     21
    122/* pem.h for openssl */
     23
     24/*!
     25    \file wolfssl/openssl/pem.h
     26*/
    227
    328
    … …  
    1439#endif
    1540
    16 #define PEM_write_bio_PrivateKey wolfSSL_PEM_write_bio_PrivateKey
    17 
    1841/* RSA */
    1942WOLFSSL_API
    … …  
    2346                                        pem_password_cb* cb, void* arg);
    2447WOLFSSL_API
     48WOLFSSL_RSA* wolfSSL_PEM_read_bio_RSAPrivateKey(WOLFSSL_BIO* bio,
     49                                                  WOLFSSL_RSA**,
     50                                                  pem_password_cb* cb,
     51                                                  void* arg);
     52WOLFSSL_API
    2553int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher,
    2654                                        unsigned char* passwd, int len,
    … …  
    2856#if !defined(NO_FILESYSTEM)
    2957WOLFSSL_API
    30 int wolfSSL_PEM_write_RSAPrivateKey(FILE *fp, WOLFSSL_RSA *rsa,
     58int wolfSSL_PEM_write_RSAPrivateKey(XFILE fp, WOLFSSL_RSA *rsa,
    3159                                    const EVP_CIPHER *enc,
    3260                                    unsigned char *kstr, int klen,
    3361                                    pem_password_cb *cb, void *u);
    3462WOLFSSL_API
    35 WOLFSSL_RSA *wolfSSL_PEM_read_RSAPublicKey(FILE *fp, WOLFSSL_RSA **x,
     63WOLFSSL_RSA *wolfSSL_PEM_read_RSAPublicKey(XFILE fp, WOLFSSL_RSA **x,
    3664                                           pem_password_cb *cb, void *u);
    3765WOLFSSL_API
    38 int wolfSSL_PEM_write_RSAPublicKey(FILE *fp, WOLFSSL_RSA *x);
     66int wolfSSL_PEM_write_RSAPublicKey(XFILE fp, WOLFSSL_RSA *x);
    3967
    4068WOLFSSL_API
    41 int wolfSSL_PEM_write_RSA_PUBKEY(FILE *fp, WOLFSSL_RSA *x);
     69int wolfSSL_PEM_write_RSA_PUBKEY(XFILE fp, WOLFSSL_RSA *x);
    4270#endif /* NO_FILESYSTEM */
    4371
    … …  
    5684#if !defined(NO_FILESYSTEM)
    5785WOLFSSL_API
    58 int wolfSSL_PEM_write_DSAPrivateKey(FILE *fp, WOLFSSL_DSA *dsa,
     86int wolfSSL_PEM_write_DSAPrivateKey(XFILE fp, WOLFSSL_DSA *dsa,
    5987                                    const EVP_CIPHER *enc,
    6088                                    unsigned char *kstr, int klen,
    6189                                    pem_password_cb *cb, void *u);
    6290WOLFSSL_API
    63 int wolfSSL_PEM_write_DSA_PUBKEY(FILE *fp, WOLFSSL_DSA *x);
     91int wolfSSL_PEM_write_DSA_PUBKEY(XFILE fp, WOLFSSL_DSA *x);
    6492#endif /* NO_FILESYSTEM */
    6593
    … …  
    77105#if !defined(NO_FILESYSTEM)
    78106WOLFSSL_API
    79 int wolfSSL_PEM_write_ECPrivateKey(FILE *fp, WOLFSSL_EC_KEY *key,
     107int wolfSSL_PEM_write_ECPrivateKey(XFILE fp, WOLFSSL_EC_KEY *key,
    80108                                   const EVP_CIPHER *enc,
    81109                                   unsigned char *kstr, int klen,
    82110                                   pem_password_cb *cb, void *u);
    83111WOLFSSL_API
    84 int wolfSSL_PEM_write_EC_PUBKEY(FILE *fp, WOLFSSL_EC_KEY *key);
     112int wolfSSL_PEM_write_EC_PUBKEY(XFILE fp, WOLFSSL_EC_KEY *key);
    85113#endif /* NO_FILESYSTEM */
    86114
    … …  
    92120                                                  void* arg);
    93121WOLFSSL_API
     122WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_bio_PUBKEY(WOLFSSL_BIO* bio,
     123                                              WOLFSSL_EVP_PKEY **key,
     124                                              pem_password_cb *cb, void *pass);
     125WOLFSSL_API
    94126int wolfSSL_PEM_write_bio_PrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EVP_PKEY* key,
    95127                                        const WOLFSSL_EVP_CIPHER* cipher,
    … …  
    97129                                        pem_password_cb* cb, void* arg);
    98130
    99 WOLFSSL_API
    100 int wolfSSL_EVP_PKEY_type(int type);
    101131
    102132WOLFSSL_API
    103 int wolfSSL_EVP_PKEY_base_id(const EVP_PKEY *pkey);
     133int wolfSSL_PEM_read_bio(WOLFSSL_BIO* bio, char **name, char **header,
     134                         unsigned char **data, long *len);
     135WOLFSSL_API
     136int wolfSSL_PEM_write_bio(WOLFSSL_BIO *bio, const char *name,
     137                          const char *header, const unsigned char *data,
     138                          long len);
     139#if !defined(NO_FILESYSTEM)
     140WOLFSSL_API
     141int wolfSSL_PEM_read(XFILE fp, char **name, char **header, unsigned char **data,
     142                     long *len);
     143WOLFSSL_API
     144int wolfSSL_PEM_write(XFILE fp, const char *name, const char *header,
     145                      const unsigned char *data, long len);
     146#endif
    104147
    105148#if !defined(NO_FILESYSTEM)
    106149WOLFSSL_API
    107 WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PUBKEY(FILE *fp, EVP_PKEY **x,
     150WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PUBKEY(XFILE fp, EVP_PKEY **x,
    108151                                                                                  pem_password_cb *cb, void *u);
    109152WOLFSSL_API
    110 WOLFSSL_X509 *wolfSSL_PEM_read_X509(FILE *fp, WOLFSSL_X509 **x,
     153WOLFSSL_X509 *wolfSSL_PEM_read_X509(XFILE fp, WOLFSSL_X509 **x,
    111154                                          pem_password_cb *cb, void *u);
    112155WOLFSSL_API
    113 WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PrivateKey(FILE *fp, WOLFSSL_EVP_PKEY **x,
     156WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PrivateKey(XFILE fp, WOLFSSL_EVP_PKEY **x,
    114157                                          pem_password_cb *cb, void *u);
     158
     159WOLFSSL_API
     160int wolfSSL_PEM_write_X509(XFILE fp, WOLFSSL_X509 *x);
    115161#endif /* NO_FILESYSTEM */
     162
     163#define PEM_read                        wolfSSL_PEM_read
     164#define PEM_read_bio                    wolfSSL_PEM_read_bio
     165#define PEM_write                       wolfSSL_PEM_write
     166#define PEM_write_bio                   wolfSSL_PEM_write_bio
    116167
    117168#define PEM_read_X509               wolfSSL_PEM_read_X509
    118169#define PEM_read_PrivateKey         wolfSSL_PEM_read_PrivateKey
     170#define PEM_write_X509                  wolfSSL_PEM_write_X509
    119171#define PEM_write_bio_PrivateKey    wolfSSL_PEM_write_bio_PrivateKey
     172#define PEM_write_bio_PKCS8PrivateKey   wolfSSL_PEM_write_bio_PKCS8PrivateKey
    120173/* RSA */
    121174#define PEM_write_bio_RSAPrivateKey wolfSSL_PEM_write_bio_RSAPrivateKey
     175#define PEM_read_bio_RSAPrivateKey      wolfSSL_PEM_read_bio_RSAPrivateKey
    122176#define PEM_write_RSAPrivateKey     wolfSSL_PEM_write_RSAPrivateKey
    123177#define PEM_write_RSA_PUBKEY        wolfSSL_PEM_write_RSA_PUBKEY
    … …  
    135189#define PEM_read_bio_PrivateKey wolfSSL_PEM_read_bio_PrivateKey
    136190#define PEM_read_PUBKEY         wolfSSL_PEM_read_PUBKEY
    137 #define EVP_PKEY_type           wolfSSL_EVP_PKEY_type
     191#define PEM_read_bio_PUBKEY             wolfSSL_PEM_read_bio_PUBKEY
    138192
    139193#ifdef __cplusplus
Note: See TracChangeset for help on using the changeset viewer.