diff options
| author | tb <> | 2021-12-24 12:59:18 +0000 |
|---|---|---|
| committer | tb <> | 2021-12-24 12:59:18 +0000 |
| commit | 60fc41d3383b676bdaea8bc4f89d5f7b69a1e209 (patch) | |
| tree | cd51fb6842fa5cc823cb316186608d14e1999b27 /src/lib/libcrypto/pem/pem.h | |
| parent | 14c0a5588259a5ff88a444ac6086fe520265ec25 (diff) | |
| download | openbsd-60fc41d3383b676bdaea8bc4f89d5f7b69a1e209.tar.gz openbsd-60fc41d3383b676bdaea8bc4f89d5f7b69a1e209.tar.bz2 openbsd-60fc41d3383b676bdaea8bc4f89d5f7b69a1e209.zip | |
Prepare to provide PEM_write_bio_PrivateKey_traditional()
This will be needed in openssl-ruby after the bump.
Part of OpenSSL commit 05dba815.
ok inoguchi jsing
Diffstat (limited to 'src/lib/libcrypto/pem/pem.h')
| -rw-r--r-- | src/lib/libcrypto/pem/pem.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/libcrypto/pem/pem.h b/src/lib/libcrypto/pem/pem.h index 01c7174d39..b447dc4ac2 100644 --- a/src/lib/libcrypto/pem/pem.h +++ b/src/lib/libcrypto/pem/pem.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pem.h,v 1.20 2021/10/31 16:28:50 tb Exp $ */ | 1 | /* $OpenBSD: pem.h,v 1.21 2021/12/24 12:59:17 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -482,6 +482,11 @@ DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY) | |||
| 482 | 482 | ||
| 483 | DECLARE_PEM_rw(PUBKEY, EVP_PKEY) | 483 | DECLARE_PEM_rw(PUBKEY, EVP_PKEY) |
| 484 | 484 | ||
| 485 | #if defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_CRYPTO_INTERNAL) | ||
| 486 | int PEM_write_bio_PrivateKey_traditional(BIO *bp, EVP_PKEY *x, | ||
| 487 | const EVP_CIPHER *enc, unsigned char *kstr, int klen, pem_password_cb *cb, | ||
| 488 | void *u); | ||
| 489 | #endif | ||
| 485 | int PEM_write_bio_PKCS8PrivateKey_nid(BIO *bp, EVP_PKEY *x, int nid, | 490 | int PEM_write_bio_PKCS8PrivateKey_nid(BIO *bp, EVP_PKEY *x, int nid, |
| 486 | char *kstr, int klen, | 491 | char *kstr, int klen, |
| 487 | pem_password_cb *cb, void *u); | 492 | pem_password_cb *cb, void *u); |
