diff options
| author |   jsing <jsing@openbsd.org> | 2016-09-04 17:25:27 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2016-09-04 17:25:27 +0000 |
| commit | 7ff1b35d5075397a8b558ece0079c1d8a4252069 (patch) | |
| tree | 8627209ccbecfa28da3f3522b17ed404db629bc0 | |
| parent | Regen. (diff) | |
| download | wireguard-openbsd-7ff1b35d5075397a8b558ece0079c1d8a4252069.tar.xz wireguard-openbsd-7ff1b35d5075397a8b558ece0079c1d8a4252069.zip | |
Expand DECLARE_ASN1_.*FUNCTIONS macros.
No change in preprocessed output, ignoring whitespace and line numbers.
| -rw-r--r-- | lib/libcrypto/rsa/rsa.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/libcrypto/rsa/rsa.h b/lib/libcrypto/rsa/rsa.h index d240294809f..febeb297d00 100644 --- a/lib/libcrypto/rsa/rsa.h +++ b/lib/libcrypto/rsa/rsa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa.h,v 1.28 2016/06/30 02:02:06 bcook Exp $ */ +/* $OpenBSD: rsa.h,v 1.29 2016/09/04 17:25:27 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -293,8 +293,12 @@ const RSA_METHOD *RSA_PKCS1_SSLeay(void); const RSA_METHOD *RSA_null_method(void); -DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPublicKey) -DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPrivateKey) +RSA *d2i_RSAPublicKey(RSA **a, const unsigned char **in, long len); +int i2d_RSAPublicKey(const RSA *a, unsigned char **out); +extern const ASN1_ITEM RSAPublicKey_it; +RSA *d2i_RSAPrivateKey(RSA **a, const unsigned char **in, long len); +int i2d_RSAPrivateKey(const RSA *a, unsigned char **out); +extern const ASN1_ITEM RSAPrivateKey_it; typedef struct rsa_pss_params_st { X509_ALGOR *hashAlgorithm; @@ -303,7 +307,11 @@ typedef struct rsa_pss_params_st { ASN1_INTEGER *trailerField; } RSA_PSS_PARAMS; -DECLARE_ASN1_FUNCTIONS(RSA_PSS_PARAMS) +RSA_PSS_PARAMS *RSA_PSS_PARAMS_new(void); +void RSA_PSS_PARAMS_free(RSA_PSS_PARAMS *a); +RSA_PSS_PARAMS *d2i_RSA_PSS_PARAMS(RSA_PSS_PARAMS **a, const unsigned char **in, long len); +int i2d_RSA_PSS_PARAMS(RSA_PSS_PARAMS *a, unsigned char **out); +extern const ASN1_ITEM RSA_PSS_PARAMS_it; int RSA_print_fp(FILE *fp, const RSA *r, int offset); |