Security-55471.14.8.tar.gz

[apple/security.git] / libsecurity_ssl / lib / sslBER.c

diff --git a/libsecurity_ssl/lib/sslBER.c b/libsecurity_ssl/lib/sslBER.c
index df938a6c8cdf700986b7a9aeee9f14ca26e832ab..63fc16168a02b42835341dce2b05e57537c7eeae 100644 (file)
--- a/libsecurity_ssl/lib/sslBER.c
+++ b/libsecurity_ssl/lib/sslBER.c
@@ -128,7 +128,7 @@ OSStatus sslEncodeRsaBlob(
     encBlob = SEC_ASN1EncodeItem(pool, &dest, &nssPubKey,
         kSecAsn1RSAPublicKeyPKCS1Template);
        if (!encBlob)
     encBlob = SEC_ASN1EncodeItem(pool, &dest, &nssPubKey,
         kSecAsn1RSAPublicKeyPKCS1Template);
        if (!encBlob)

-               srtn = memFullErr;
+               srtn = errSecAllocate;

     else {
         /* copy out to caller */
         srtn = SSLCopyBufferFromData(encBlob->Data, encBlob->Length, blob);
     else {
         /* copy out to caller */
         srtn = SSLCopyBufferFromData(encBlob->Data, encBlob->Length, blob);


@@ -224,7 +224,7 @@ OSStatus sslEncodeDhParams(
     encBlob = SEC_ASN1EncodeItem(pool, &dest, &dhParams,
         kSecAsn1DHParameterTemplate);
        if (!encBlob)
     encBlob = SEC_ASN1EncodeItem(pool, &dest, &dhParams,
         kSecAsn1DHParameterTemplate);
        if (!encBlob)

-               srtn = memFullErr;
+               srtn = errSecAllocate;

     else {
         /* copy out to caller */
         srtn = SSLCopyBufferFromData(encBlob->Data, encBlob->Length, blob);
     else {
         /* copy out to caller */
         srtn = SSLCopyBufferFromData(encBlob->Data, encBlob->Length, blob);


@@ -329,7 +329,7 @@ OSStatus sslEcdsaPubKeyBits(
 {
        SecAsn1CoderRef coder = NULL;
        CSSM_X509_SUBJECT_PUBLIC_KEY_INFO subjPubKeyInfo;
 {
        SecAsn1CoderRef coder = NULL;
        CSSM_X509_SUBJECT_PUBLIC_KEY_INFO subjPubKeyInfo;

-       OSStatus ortn = noErr;
+       OSStatus ortn = errSecSuccess;

 
        CSSM_KEYHEADER *hdr = &pubKey->KeyHeader;
        if(hdr->AlgorithmId != CSSM_ALGID_ECDSA) {
 
        CSSM_KEYHEADER *hdr = &pubKey->KeyHeader;
        if(hdr->AlgorithmId != CSSM_ALGID_ECDSA) {