src - OpenBSD base system

diff options


context:
space:
mode:

author	Joel Sing <jsing@cvs.openbsd.org>	2014-05-24 07:11:40 +0000
committer	Joel Sing <jsing@cvs.openbsd.org>	2014-05-24 07:11:40 +0000
commit	6edca8ee69d40dcbd2e6073c8b0e61fa6919a26f (patch)
tree	1ef8e88d41e533ce7fa626495e7dc25c8bc0299a /lib
parent	e4e53e213aa28cc1f7d9ef9afdc35c801cf50ee9 (diff)

Spell ssize_t correctly (the incorrect spelling is ossl_ssize_t).

ok miod@

Diffstat (limited to 'lib')

-rw-r--r--

lib/libcrypto/bio/bss_bio.c

-rw-r--r--

lib/libcrypto/cms/cms.h

-rw-r--r--

lib/libcrypto/cms/cms_pwri.c

-rw-r--r--

lib/libcrypto/cms/cms_smime.c

4 files changed, 42 insertions, 14 deletions

diff --git a/lib/libcrypto/bio/bss_bio.c b/lib/libcrypto/bio/bss_bio.c
index 1a17cdf2755..eda2e2a55c2 100644
--- a/lib/libcrypto/bio/bss_bio.c
+++ b/lib/libcrypto/bio/bss_bio.c

@@ -259,11 +259,11 @@ bio_read(BIO *bio, char *buf, int size_)

/* WARNING: The non-copying interface is largely untested as of yet

* and may contain bugs. */

-static ossl_ssize_t

+static ssize_t

bio_nread0(BIO *bio, char **buf)

{

struct bio_bio_st *b, *peer_b;

- ossl_ssize_t num;

+ ssize_t num;

BIO_clear_retry_flags(bio);

@@ -297,16 +297,16 @@ bio_nread0(BIO *bio, char **buf)

return num;

}

-static ossl_ssize_t

+static ssize_t

bio_nread(BIO *bio, char **buf, size_t num_)

{

struct bio_bio_st *b, *peer_b;

- ossl_ssize_t num, available;

+ ssize_t num, available;

if (num_ > SSIZE_MAX)

num = SSIZE_MAX;

else

- num = (ossl_ssize_t)num_;

+ num = (ssize_t)num_;

available = bio_nread0(bio, buf);

if (num > available)

@@ -408,7 +408,7 @@ bio_write(BIO *bio, const char *buf, int num_)

* (example usage: bio_nwrite0(), write to buffer, bio_nwrite()

* or just bio_nwrite(), write to buffer)

-static ossl_ssize_t

+static ssize_t

bio_nwrite0(BIO *bio, char **buf)

{

struct bio_bio_st *b;

@@ -456,16 +456,16 @@ bio_nwrite0(BIO *bio, char **buf)

return num;

}

-static ossl_ssize_t

+static ssize_t

bio_nwrite(BIO *bio, char **buf, size_t num_)

{

struct bio_bio_st *b;

- ossl_ssize_t num, space;

+ ssize_t num, space;

if (num_ > SSIZE_MAX)

num = SSIZE_MAX;

else

- num = (ossl_ssize_t)num_;

+ num = (ssize_t)num_;

space = bio_nwrite0(bio, buf);

if (num > space)

diff --git a/lib/libcrypto/cms/cms.h b/lib/libcrypto/cms/cms.h
index 25f88745f23..150607469dd 100644
--- a/lib/libcrypto/cms/cms.h
+++ b/lib/libcrypto/cms/cms.h

@@ -76,8 +76,9 @@ typedef struct CMS_Receipt_st CMS_Receipt;

DECLARE_STACK_OF(CMS_SignerInfo)

DECLARE_STACK_OF(GENERAL_NAMES)

-DECLARE_ASN1_FUNCTIONS_const(CMS_ContentInfo)

-DECLARE_ASN1_FUNCTIONS_const(CMS_ReceiptRequest)

+DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo)

+DECLARE_ASN1_FUNCTIONS(CMS_ReceiptRequest)

+DECLARE_ASN1_PRINT_FUNCTION(CMS_ContentInfo)

#define CMS_SIGNERINFO_ISSUER_SERIAL 0

#define CMS_SIGNERINFO_KEYIDENTIFIER 1

@@ -110,6 +111,7 @@ DECLARE_ASN1_FUNCTIONS_const(CMS_ReceiptRequest)

#define CMS_PARTIAL 0x4000

#define CMS_REUSE_DIGEST 0x8000

#define CMS_USE_KEYID 0x10000

+#define CMS_DEBUG_DECRYPT 0x20000

const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms);

@@ -124,9 +126,13 @@ int CMS_set_detached(CMS_ContentInfo *cms, int detached);

DECLARE_PEM_rw_const(CMS, CMS_ContentInfo)

#endif

+int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms);

CMS_ContentInfo *d2i_CMS_bio(BIO *bp, CMS_ContentInfo **cms);

int i2d_CMS_bio(BIO *bp, CMS_ContentInfo *cms);

+BIO *BIO_new_CMS(BIO *out, CMS_ContentInfo *cms);

+int i2d_CMS_bio_stream(BIO *out, CMS_ContentInfo *cms, BIO *in, int flags);

+int PEM_write_bio_CMS_stream(BIO *out, CMS_ContentInfo *cms, BIO *in, int flags);

CMS_ContentInfo *SMIME_read_CMS(BIO *bio, BIO **bcont);

int SMIME_write_CMS(BIO *bio, CMS_ContentInfo *cms, BIO *data, int flags);

@@ -179,6 +185,8 @@ int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert);

int CMS_decrypt_set1_key(CMS_ContentInfo *cms,

unsigned char *key, size_t keylen,

unsigned char *id, size_t idlen);

+int CMS_decrypt_set1_password(CMS_ContentInfo *cms,

+ unsigned char *pass, ssize_t passlen);

STACK_OF(CMS_RecipientInfo) *CMS_get0_RecipientInfos(CMS_ContentInfo *cms);

int CMS_RecipientInfo_type(CMS_RecipientInfo *ri);

@@ -214,6 +222,16 @@ int CMS_RecipientInfo_set0_key(CMS_RecipientInfo *ri,

int CMS_RecipientInfo_kekri_id_cmp(CMS_RecipientInfo *ri,

const unsigned char *id, size_t idlen);

+int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,

+ unsigned char *pass,

+ ssize_t passlen);

+CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,

+ int iter, int wrap_nid, int pbe_nid,

+ unsigned char *pass,

+ ssize_t passlen,

+ const EVP_CIPHER *kekciph);

int CMS_RecipientInfo_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri);

int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out,

@@ -230,6 +248,7 @@ STACK_OF(X509) *CMS_get1_certs(CMS_ContentInfo *cms);

CMS_RevocationInfoChoice *CMS_add0_RevocationInfoChoice(CMS_ContentInfo *cms);

int CMS_add0_crl(CMS_ContentInfo *cms, X509_CRL *crl);

+int CMS_add1_crl(CMS_ContentInfo *cms, X509_CRL *crl);

STACK_OF(X509_CRL) *CMS_get1_crls(CMS_ContentInfo *cms);

int CMS_SignedData_init(CMS_ContentInfo *cms);

@@ -324,6 +343,7 @@ void ERR_load_CMS_strings(void);

#define CMS_F_CHECK_CONTENT 99

#define CMS_F_CMS_ADD0_CERT 164

#define CMS_F_CMS_ADD0_RECIPIENT_KEY 100

+#define CMS_F_CMS_ADD0_RECIPIENT_PASSWORD 165

#define CMS_F_CMS_ADD1_RECEIPTREQUEST 158

#define CMS_F_CMS_ADD1_RECIPIENT_CERT 101

#define CMS_F_CMS_ADD1_SIGNER 102

@@ -338,6 +358,7 @@ void ERR_load_CMS_strings(void);

#define CMS_F_CMS_DATAINIT 111

#define CMS_F_CMS_DECRYPT 112

#define CMS_F_CMS_DECRYPT_SET1_KEY 113

+#define CMS_F_CMS_DECRYPT_SET1_PASSWORD 166

#define CMS_F_CMS_DECRYPT_SET1_PKEY 114

#define CMS_F_CMS_DIGESTALGORITHM_FIND_CTX 115

#define CMS_F_CMS_DIGESTALGORITHM_INIT_BIO 116

@@ -372,7 +393,9 @@ void ERR_load_CMS_strings(void);

#define CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT 141

#define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS 142

#define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID 143

+#define CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT 167

#define CMS_F_CMS_RECIPIENTINFO_SET0_KEY 144

+#define CMS_F_CMS_RECIPIENTINFO_SET0_PASSWORD 168

#define CMS_F_CMS_RECIPIENTINFO_SET0_PKEY 145

#define CMS_F_CMS_SET1_SIGNERIDENTIFIER 146

#define CMS_F_CMS_SET_DETACHED 147

@@ -413,6 +436,7 @@ void ERR_load_CMS_strings(void);

#define CMS_R_ERROR_SETTING_KEY 115

#define CMS_R_ERROR_SETTING_RECIPIENTINFO 116

#define CMS_R_INVALID_ENCRYPTED_KEY_LENGTH 117

+#define CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER 176

#define CMS_R_INVALID_KEY_LENGTH 118

#define CMS_R_MD_BIO_INIT_ERROR 119

#define CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH 120

@@ -425,6 +449,7 @@ void ERR_load_CMS_strings(void);

#define CMS_R_NOT_ENCRYPTED_DATA 122

#define CMS_R_NOT_KEK 123

#define CMS_R_NOT_KEY_TRANSPORT 124

+#define CMS_R_NOT_PWRI 177

#define CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE 125

#define CMS_R_NO_CIPHER 126

#define CMS_R_NO_CONTENT 127

@@ -437,6 +462,7 @@ void ERR_load_CMS_strings(void);

#define CMS_R_NO_MATCHING_RECIPIENT 132

#define CMS_R_NO_MATCHING_SIGNATURE 166

#define CMS_R_NO_MSGSIGDIGEST 167

+#define CMS_R_NO_PASSWORD 178

#define CMS_R_NO_PRIVATE_KEY 133

#define CMS_R_NO_PUBLIC_KEY 134

#define CMS_R_NO_RECEIPT_REQUEST 168

@@ -460,10 +486,12 @@ void ERR_load_CMS_strings(void);

#define CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM 151

#define CMS_R_UNSUPPORTED_CONTENT_TYPE 152

#define CMS_R_UNSUPPORTED_KEK_ALGORITHM 153

+#define CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM 179

#define CMS_R_UNSUPPORTED_RECIPIENT_TYPE 154

#define CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE 155

#define CMS_R_UNSUPPORTED_TYPE 156

#define CMS_R_UNWRAP_ERROR 157

+#define CMS_R_UNWRAP_FAILURE 180

#define CMS_R_VERIFICATION_FAILURE 158

#define CMS_R_WRAP_ERROR 159

diff --git a/lib/libcrypto/cms/cms_pwri.c b/lib/libcrypto/cms/cms_pwri.c
index 36a5db04b83..36d50f1797b 100644
--- a/lib/libcrypto/cms/cms_pwri.c
+++ b/lib/libcrypto/cms/cms_pwri.c

@@ -63,7 +63,7 @@

#include "asn1_locl.h"

int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,

- unsigned char *pass, ossl_ssize_t passlen)

+ unsigned char *pass, ssize_t passlen)

{

CMS_PasswordRecipientInfo *pwri;

if (ri->type != CMS_RECIPINFO_PASS)

@@ -83,7 +83,7 @@ int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,

CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,

int iter, int wrap_nid, int pbe_nid,

unsigned char *pass,

- ossl_ssize_t passlen,

+ ssize_t passlen,

const EVP_CIPHER *kekciph)

{

CMS_RecipientInfo *ri = NULL;

diff --git a/lib/libcrypto/cms/cms_smime.c b/lib/libcrypto/cms/cms_smime.c
index eed50cd6a31..94f60c1b5c9 100644
--- a/lib/libcrypto/cms/cms_smime.c
+++ b/lib/libcrypto/cms/cms_smime.c

@@ -706,7 +706,7 @@ int CMS_decrypt_set1_key(CMS_ContentInfo *cms,

}

int CMS_decrypt_set1_password(CMS_ContentInfo *cms,

- unsigned char *pass, ossl_ssize_t passlen)

+ unsigned char *pass, ssize_t passlen)

{

STACK_OF(CMS_RecipientInfo) *ris;

CMS_RecipientInfo *ri;