← Back to branch summary

~ubuntu-branches/ubuntu/maverick/openssl/maverick

« back to all changes in this revision

Viewing changes to ssl/s3_pkt.c

  • Committer: Bazaar Package Importer
  • Author(s): Christoph Martin
  • Date: 2004-12-16 18:41:29 UTC
  • mto: (11.1.1 lenny)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20041216184129-z7xjkul57mh1jiha
Tags: upstream-0.9.7e
Import upstream version 0.9.7e

Show diffs side-by-side

added added

removed removed

Lines of Context:
ssl/s3_pkt.c
862
862
                {
863
863
                al=SSL_AD_UNEXPECTED_MESSAGE;
864
864
                SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_DATA_BETWEEN_CCS_AND_FINISHED);
865
 
                goto err;
 
865
                goto f_err;
866
866
                }
867
867
 
868
868
        /* If the other end has shut down, throw anything we read away
969
969
                        {
970
970
                        al=SSL_AD_DECODE_ERROR;
971
971
                        SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_BAD_HELLO_REQUEST);
972
 
                        goto err;
 
972
                        goto f_err;
973
973
                        }
974
974
 
975
975
                if (s->msg_callback)
1080
1080
                if (    (rr->length != 1) || (rr->off != 0) ||
1081
1081
                        (rr->data[0] != SSL3_MT_CCS))
1082
1082
                        {
1083
 
                        i=SSL_AD_ILLEGAL_PARAMETER;
 
1083
                        al=SSL_AD_ILLEGAL_PARAMETER;
1084
1084
                        SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_BAD_CHANGE_CIPHER_SPEC);
1085
 
                        goto err;
 
1085
                        goto f_err;
1086
1086
                        }
1087
1087
 
1088
1088
                /* Check we have a cipher to change to */
1089
1089
                if (s->s3->tmp.new_cipher == NULL)
1090
1090
                        {
1091
 
                        i=SSL_AD_UNEXPECTED_MESSAGE;
 
1091
                        al=SSL_AD_UNEXPECTED_MESSAGE;
1092
1092
                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_CCS_RECEIVED_EARLY);
1093
 
                        goto err;
 
1093
                        goto f_err;
1094
1094
                        }
1095
1095
 
1096
1096
                rr->length=0;