diff options
Diffstat (limited to 'src/lib/libcrypto/pem/pem.h')
-rw-r--r-- | src/lib/libcrypto/pem/pem.h | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/src/lib/libcrypto/pem/pem.h b/src/lib/libcrypto/pem/pem.h index fc333e42c8..e4bae0b4aa 100644 --- a/src/lib/libcrypto/pem/pem.h +++ b/src/lib/libcrypto/pem/pem.h | |||
@@ -103,13 +103,16 @@ extern "C" { | |||
103 | 103 | ||
104 | #define PEM_STRING_X509_OLD "X509 CERTIFICATE" | 104 | #define PEM_STRING_X509_OLD "X509 CERTIFICATE" |
105 | #define PEM_STRING_X509 "CERTIFICATE" | 105 | #define PEM_STRING_X509 "CERTIFICATE" |
106 | #define PEM_STRING_X509_TRUSTED "TRUSTED CERTIFICATE" | ||
106 | #define PEM_STRING_X509_REQ_OLD "NEW CERTIFICATE REQUEST" | 107 | #define PEM_STRING_X509_REQ_OLD "NEW CERTIFICATE REQUEST" |
107 | #define PEM_STRING_X509_REQ "CERTIFICATE REQUEST" | 108 | #define PEM_STRING_X509_REQ "CERTIFICATE REQUEST" |
108 | #define PEM_STRING_X509_CRL "X509 CRL" | 109 | #define PEM_STRING_X509_CRL "X509 CRL" |
109 | #define PEM_STRING_EVP_PKEY "ANY PRIVATE KEY" | 110 | #define PEM_STRING_EVP_PKEY "ANY PRIVATE KEY" |
111 | #define PEM_STRING_PUBLIC "PUBLIC KEY" | ||
110 | #define PEM_STRING_RSA "RSA PRIVATE KEY" | 112 | #define PEM_STRING_RSA "RSA PRIVATE KEY" |
111 | #define PEM_STRING_RSA_PUBLIC "RSA PUBLIC KEY" | 113 | #define PEM_STRING_RSA_PUBLIC "RSA PUBLIC KEY" |
112 | #define PEM_STRING_DSA "DSA PRIVATE KEY" | 114 | #define PEM_STRING_DSA "DSA PRIVATE KEY" |
115 | #define PEM_STRING_DSA_PUBLIC "DSA PUBLIC KEY" | ||
113 | #define PEM_STRING_PKCS7 "PKCS7" | 116 | #define PEM_STRING_PKCS7 "PKCS7" |
114 | #define PEM_STRING_PKCS8 "ENCRYPTED PRIVATE KEY" | 117 | #define PEM_STRING_PKCS8 "ENCRYPTED PRIVATE KEY" |
115 | #define PEM_STRING_PKCS8INF "PRIVATE KEY" | 118 | #define PEM_STRING_PKCS8INF "PRIVATE KEY" |
@@ -528,7 +531,10 @@ void PEM_dek_info(char *buf, const char *type, int len, char *str); | |||
528 | 531 | ||
529 | DECLARE_PEM_rw(X509, X509) | 532 | DECLARE_PEM_rw(X509, X509) |
530 | 533 | ||
534 | DECLARE_PEM_rw(X509_AUX, X509) | ||
535 | |||
531 | DECLARE_PEM_rw(X509_REQ, X509_REQ) | 536 | DECLARE_PEM_rw(X509_REQ, X509_REQ) |
537 | DECLARE_PEM_write(X509_REQ_NEW, X509_REQ) | ||
532 | 538 | ||
533 | DECLARE_PEM_rw(X509_CRL, X509_CRL) | 539 | DECLARE_PEM_rw(X509_CRL, X509_CRL) |
534 | 540 | ||
@@ -545,6 +551,7 @@ DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO) | |||
545 | DECLARE_PEM_rw_cb(RSAPrivateKey, RSA) | 551 | DECLARE_PEM_rw_cb(RSAPrivateKey, RSA) |
546 | 552 | ||
547 | DECLARE_PEM_rw(RSAPublicKey, RSA) | 553 | DECLARE_PEM_rw(RSAPublicKey, RSA) |
554 | DECLARE_PEM_rw(RSA_PUBKEY, RSA) | ||
548 | 555 | ||
549 | #endif | 556 | #endif |
550 | 557 | ||
@@ -552,6 +559,8 @@ DECLARE_PEM_rw(RSAPublicKey, RSA) | |||
552 | 559 | ||
553 | DECLARE_PEM_rw_cb(DSAPrivateKey, DSA) | 560 | DECLARE_PEM_rw_cb(DSAPrivateKey, DSA) |
554 | 561 | ||
562 | DECLARE_PEM_rw(DSA_PUBKEY, DSA) | ||
563 | |||
555 | DECLARE_PEM_rw(DSAparams, DSA) | 564 | DECLARE_PEM_rw(DSAparams, DSA) |
556 | 565 | ||
557 | #endif | 566 | #endif |
@@ -564,10 +573,36 @@ DECLARE_PEM_rw(DHparams, DH) | |||
564 | 573 | ||
565 | DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY) | 574 | DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY) |
566 | 575 | ||
576 | DECLARE_PEM_rw(PUBKEY, EVP_PKEY) | ||
577 | |||
578 | int PEM_write_bio_PKCS8PrivateKey_nid(BIO *bp, EVP_PKEY *x, int nid, | ||
579 | char *kstr, int klen, | ||
580 | pem_password_cb *cb, void *u); | ||
567 | int PEM_write_bio_PKCS8PrivateKey(BIO *, EVP_PKEY *, const EVP_CIPHER *, | 581 | int PEM_write_bio_PKCS8PrivateKey(BIO *, EVP_PKEY *, const EVP_CIPHER *, |
568 | char *, int, pem_password_cb *, void *); | 582 | char *, int, pem_password_cb *, void *); |
583 | int i2d_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc, | ||
584 | char *kstr, int klen, | ||
585 | pem_password_cb *cb, void *u); | ||
586 | int i2d_PKCS8PrivateKey_nid_bio(BIO *bp, EVP_PKEY *x, int nid, | ||
587 | char *kstr, int klen, | ||
588 | pem_password_cb *cb, void *u); | ||
589 | EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u); | ||
590 | |||
591 | int i2d_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc, | ||
592 | char *kstr, int klen, | ||
593 | pem_password_cb *cb, void *u); | ||
594 | int i2d_PKCS8PrivateKey_nid_fp(FILE *fp, EVP_PKEY *x, int nid, | ||
595 | char *kstr, int klen, | ||
596 | pem_password_cb *cb, void *u); | ||
597 | int PEM_write_PKCS8PrivateKey_nid(FILE *fp, EVP_PKEY *x, int nid, | ||
598 | char *kstr, int klen, | ||
599 | pem_password_cb *cb, void *u); | ||
600 | |||
601 | EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u); | ||
602 | |||
569 | int PEM_write_PKCS8PrivateKey(FILE *fp,EVP_PKEY *x,const EVP_CIPHER *enc, | 603 | int PEM_write_PKCS8PrivateKey(FILE *fp,EVP_PKEY *x,const EVP_CIPHER *enc, |
570 | char *kstr,int klen, pem_password_cb *cd, void *u); | 604 | char *kstr,int klen, pem_password_cb *cd, void *u); |
605 | |||
571 | #endif /* SSLEAY_MACROS */ | 606 | #endif /* SSLEAY_MACROS */ |
572 | 607 | ||
573 | 608 | ||
@@ -579,6 +614,8 @@ int PEM_write_PKCS8PrivateKey(FILE *fp,EVP_PKEY *x,const EVP_CIPHER *enc, | |||
579 | /* Error codes for the PEM functions. */ | 614 | /* Error codes for the PEM functions. */ |
580 | 615 | ||
581 | /* Function codes. */ | 616 | /* Function codes. */ |
617 | #define PEM_F_D2I_PKCS8PRIVATEKEY_BIO 120 | ||
618 | #define PEM_F_D2I_PKCS8PRIVATEKEY_FP 121 | ||
582 | #define PEM_F_DEF_CALLBACK 100 | 619 | #define PEM_F_DEF_CALLBACK 100 |
583 | #define PEM_F_LOAD_IV 101 | 620 | #define PEM_F_LOAD_IV 101 |
584 | #define PEM_F_PEM_ASN1_READ 102 | 621 | #define PEM_F_PEM_ASN1_READ 102 |
@@ -586,6 +623,7 @@ int PEM_write_PKCS8PrivateKey(FILE *fp,EVP_PKEY *x,const EVP_CIPHER *enc, | |||
586 | #define PEM_F_PEM_ASN1_WRITE 104 | 623 | #define PEM_F_PEM_ASN1_WRITE 104 |
587 | #define PEM_F_PEM_ASN1_WRITE_BIO 105 | 624 | #define PEM_F_PEM_ASN1_WRITE_BIO 105 |
588 | #define PEM_F_PEM_DO_HEADER 106 | 625 | #define PEM_F_PEM_DO_HEADER 106 |
626 | #define PEM_F_PEM_F_DO_PK8KEY_FP 122 | ||
589 | #define PEM_F_PEM_F_PEM_WRITE_PKCS8PRIVATEKEY 118 | 627 | #define PEM_F_PEM_F_PEM_WRITE_PKCS8PRIVATEKEY 118 |
590 | #define PEM_F_PEM_GET_EVP_CIPHER_INFO 107 | 628 | #define PEM_F_PEM_GET_EVP_CIPHER_INFO 107 |
591 | #define PEM_F_PEM_READ 108 | 629 | #define PEM_F_PEM_READ 108 |