equal
deleted
inserted
replaced
117 +#endif |
117 +#endif |
118 } |
118 } |
119 |
119 |
120 void CRYPTO_set_locking_callback(void (*func) (int mode, int type, |
120 void CRYPTO_set_locking_callback(void (*func) (int mode, int type, |
121 @@ -1104,6 +1120,12 @@ |
121 @@ -1104,6 +1120,12 @@ |
122 MessageBox(NULL, buf, _T("OpenSSL: FATAL"), MB_OK | MB_ICONSTOP); |
122 MessageBox(NULL, buf, _T("OpenSSL: FATAL"), MB_OK | MB_ICONERROR); |
123 } |
123 } |
124 #else |
124 #else |
125 +/* |
125 +/* |
126 + * Solaris libsa.a used for WAN boot doesn't provide for vfprintf(). Since |
126 + * Solaris libsa.a used for WAN boot doesn't provide for vfprintf(). Since |
127 + * OPENSSL_showfatal() is not used anywhere else then here we can safely use |
127 + * OPENSSL_showfatal() is not used anywhere else then here we can safely use |
656 |
656 |
657 return 1; |
657 return 1; |
658 } |
658 } |
659 +#endif /*!_BOOT*/ |
659 +#endif /*!_BOOT*/ |
660 |
660 |
661 int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, |
661 int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, |
662 int n) |
662 unsigned char *limit) |
663 @@ -2486,11 +2492,13 @@ |
663 @@ -2486,11 +2492,13 @@ |
664 return 0; |
664 return 0; |
665 } |
665 } |
666 |
666 |
667 +#ifndef _BOOT |
667 +#ifndef _BOOT |
668 custom_ext_init(&s->cert->srv_ext); |
668 custom_ext_init(&s->cert->srv_ext); |
669 if (ssl_scan_clienthello_custom_tlsext(s, ptmp, d + n, &al) <= 0) { |
669 if (ssl_scan_clienthello_custom_tlsext(s, ptmp, limit, &al) <= 0) { |
670 ssl3_send_alert(s, SSL3_AL_FATAL, al); |
670 ssl3_send_alert(s, SSL3_AL_FATAL, al); |
671 return 0; |
671 return 0; |
672 } |
672 } |
673 +#endif |
673 +#endif |
674 |
674 |