8 files changed, 30 insertions, 30 deletions

diff --git a/src/lib/libcrypto/bio/bss_bio.c b/src/lib/libcrypto/bio/bss_bio.c
index 1a17cdf275..eda2e2a55c 100644
--- a/src/lib/libcrypto/bio/bss_bio.c
+++ b/src/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/src/lib/libcrypto/cms/cms.h b/src/lib/libcrypto/cms/cms.h
index 36994fa6a2..150607469d 100644
--- a/src/lib/libcrypto/cms/cms.h
+++ b/src/lib/libcrypto/cms/cms.h
@@ -186,7 +186,7 @@ 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, ossl_ssize_t passlen);
+                                unsigned char *pass, ssize_t passlen);
 
 STACK_OF(CMS_RecipientInfo) *CMS_get0_RecipientInfos(CMS_ContentInfo *cms);
 int CMS_RecipientInfo_type(CMS_RecipientInfo *ri);
@@ -224,12 +224,12 @@ int CMS_RecipientInfo_kekri_id_cmp(CMS_RecipientInfo *ri,
 
 int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri, 
                                         unsigned char *pass,
-                                        ossl_ssize_t passlen);
+                                        ssize_t passlen);
 
 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);
 
 int CMS_RecipientInfo_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri);
diff --git a/src/lib/libcrypto/cms/cms_pwri.c b/src/lib/libcrypto/cms/cms_pwri.c
index 36a5db04b8..36d50f1797 100644
--- a/src/lib/libcrypto/cms/cms_pwri.c
+++ b/src/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/src/lib/libcrypto/cms/cms_smime.c b/src/lib/libcrypto/cms/cms_smime.c
index eed50cd6a3..94f60c1b5c 100644
--- a/src/lib/libcrypto/cms/cms_smime.c
+++ b/src/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;
diff --git a/src/lib/libssl/src/crypto/bio/bss_bio.c b/src/lib/libssl/src/crypto/bio/bss_bio.c
index 1a17cdf275..eda2e2a55c 100644
--- a/src/lib/libssl/src/crypto/bio/bss_bio.c
+++ b/src/lib/libssl/src/crypto/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/src/lib/libssl/src/crypto/cms/cms.h b/src/lib/libssl/src/crypto/cms/cms.h
index 36994fa6a2..150607469d 100644
--- a/src/lib/libssl/src/crypto/cms/cms.h
+++ b/src/lib/libssl/src/crypto/cms/cms.h
@@ -186,7 +186,7 @@ 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, ossl_ssize_t passlen);
+                                unsigned char *pass, ssize_t passlen);
 
 STACK_OF(CMS_RecipientInfo) *CMS_get0_RecipientInfos(CMS_ContentInfo *cms);
 int CMS_RecipientInfo_type(CMS_RecipientInfo *ri);
@@ -224,12 +224,12 @@ int CMS_RecipientInfo_kekri_id_cmp(CMS_RecipientInfo *ri,
 
 int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri, 
                                         unsigned char *pass,
-                                        ossl_ssize_t passlen);
+                                        ssize_t passlen);
 
 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);
 
 int CMS_RecipientInfo_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri);
diff --git a/src/lib/libssl/src/crypto/cms/cms_pwri.c b/src/lib/libssl/src/crypto/cms/cms_pwri.c
index 36a5db04b8..36d50f1797 100644
--- a/src/lib/libssl/src/crypto/cms/cms_pwri.c
+++ b/src/lib/libssl/src/crypto/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/src/lib/libssl/src/crypto/cms/cms_smime.c b/src/lib/libssl/src/crypto/cms/cms_smime.c
index eed50cd6a3..94f60c1b5c 100644
--- a/src/lib/libssl/src/crypto/cms/cms_smime.c
+++ b/src/lib/libssl/src/crypto/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;