diff options
Diffstat (limited to 'include/openssl')
| -rw-r--r-- | include/openssl/bn.h | 2 | ||||
| -rw-r--r-- | include/openssl/buffer.h | 2 | ||||
| -rw-r--r-- | include/openssl/err.h | 2 | ||||
| -rw-r--r-- | include/openssl/pkcs12.h | 4 | ||||
| -rw-r--r-- | include/openssl/srp.h | 2 | ||||
| -rw-r--r-- | include/openssl/x509v3.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/include/openssl/bn.h b/include/openssl/bn.h index 82552b6e84..c4fca99ff6 100644 --- a/include/openssl/bn.h +++ b/include/openssl/bn.h @@ -90,7 +90,7 @@ int BN_get_flags(const BIGNUM *b, int n); */ void BN_with_flags(BIGNUM *dest, const BIGNUM *b, int flags); -/* Wrapper function to make using BN_GENCB easier, */ +/* Wrapper function to make using BN_GENCB easier */ int BN_GENCB_call(BN_GENCB *cb, int a, int b); BN_GENCB *BN_GENCB_new(void); diff --git a/include/openssl/buffer.h b/include/openssl/buffer.h index 88409fd9eb..e2e1e5da9d 100644 --- a/include/openssl/buffer.h +++ b/include/openssl/buffer.h @@ -36,7 +36,7 @@ extern "C" { # define BUF_strlcpy(dst, src, size) OPENSSL_strlcpy(dst, src, size) # define BUF_strlcat(dst, src, size) OPENSSL_strlcat(dst, src, size) # define BUF_strnlen(str, maxlen) OPENSSL_strnlen(str, maxlen) - + struct buf_mem_st { size_t length; /* current number of bytes */ char *data; diff --git a/include/openssl/err.h b/include/openssl/err.h index b019d0e3bb..9dcd27e9be 100644 --- a/include/openssl/err.h +++ b/include/openssl/err.h @@ -188,7 +188,7 @@ typedef struct err_state_st { # define ERR_R_INTERNAL_ERROR (4|ERR_R_FATAL) # define ERR_R_DISABLED (5|ERR_R_FATAL) # define ERR_R_INIT_FAIL (6|ERR_R_FATAL) -# define ERR_R_PASSED_INVALID_ARGUMENT (7) +# define ERR_R_PASSED_INVALID_ARGUMENT (7) /* * 99 is the maximum possible ERR_R_... code, higher values are reserved for diff --git a/include/openssl/pkcs12.h b/include/openssl/pkcs12.h index 37d02aef25..4c49fb2881 100644 --- a/include/openssl/pkcs12.h +++ b/include/openssl/pkcs12.h @@ -188,8 +188,8 @@ DECLARE_ASN1_ITEM(PKCS12_AUTHSAFES) void PKCS12_PBE_add(void); int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca); -PKCS12 *PKCS12_create(const char *pass, const char *name, EVP_PKEY *pkey, - X509 *cert, STACK_OF(X509) *ca, int nid_key, int nid_cert, +PKCS12 *PKCS12_create(const char *pass, const char *name, EVP_PKEY *pkey, + X509 *cert, STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter, int mac_iter, int keytype); PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert); diff --git a/include/openssl/srp.h b/include/openssl/srp.h index 80bcb0dd38..f2b6ec750d 100644 --- a/include/openssl/srp.h +++ b/include/openssl/srp.h @@ -57,7 +57,7 @@ typedef struct SRP_VBASE_st { } SRP_VBASE; /* - * Internal structure storing N and g pair + * Internal structure storing N and g pair */ typedef struct SRP_gN_st { char *id; diff --git a/include/openssl/x509v3.h b/include/openssl/x509v3.h index 29b7194f26..7b0403b9dc 100644 --- a/include/openssl/x509v3.h +++ b/include/openssl/x509v3.h @@ -549,7 +549,7 @@ DECLARE_ASN1_ITEM(POLICY_CONSTRAINTS) GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out, const X509V3_EXT_METHOD *method, - X509V3_CTX *ctx, int gen_type, + X509V3_CTX *ctx, int gen_type, const char *value, int is_nc); # ifdef HEADER_CONF_H |