comparison src/event/ngx_event_openssl.c @ 2049:2a92804f4109

*) back out r2040 *) refactor ngx_palloc() *) introduce ngx_pnalloc() *) additional pool blocks have smaller header
author Igor Sysoev <igor@sysoev.ru>
date Tue, 17 Jun 2008 15:00:30 +0000
parents 2b11822b12d6
children b4085596a7e6
comparison
equal deleted inserted replaced
2048:824615f3b4ec 2049:2a92804f4109
1905 } 1905 }
1906 1906
1907 len = BIO_pending(bio); 1907 len = BIO_pending(bio);
1908 s->len = len; 1908 s->len = len;
1909 1909
1910 s->data = ngx_palloc(pool, len); 1910 s->data = ngx_pnalloc(pool, len);
1911 if (s->data == NULL) { 1911 if (s->data == NULL) {
1912 goto failed; 1912 goto failed;
1913 } 1913 }
1914 1914
1915 BIO_read(bio, s->data, len); 1915 BIO_read(bio, s->data, len);
1952 p = X509_NAME_oneline(name, NULL, 0); 1952 p = X509_NAME_oneline(name, NULL, 0);
1953 1953
1954 for (len = 0; p[len]; len++) { /* void */ } 1954 for (len = 0; p[len]; len++) { /* void */ }
1955 1955
1956 s->len = len; 1956 s->len = len;
1957 s->data = ngx_palloc(pool, len); 1957 s->data = ngx_pnalloc(pool, len);
1958 if (s->data == NULL) { 1958 if (s->data == NULL) {
1959 OPENSSL_free(p); 1959 OPENSSL_free(p);
1960 X509_free(cert); 1960 X509_free(cert);
1961 return NGX_ERROR; 1961 return NGX_ERROR;
1962 } 1962 }
1994 p = X509_NAME_oneline(name, NULL, 0); 1994 p = X509_NAME_oneline(name, NULL, 0);
1995 1995
1996 for (len = 0; p[len]; len++) { /* void */ } 1996 for (len = 0; p[len]; len++) { /* void */ }
1997 1997
1998 s->len = len; 1998 s->len = len;
1999 s->data = ngx_palloc(pool, len); 1999 s->data = ngx_pnalloc(pool, len);
2000 if (s->data == NULL) { 2000 if (s->data == NULL) {
2001 OPENSSL_free(p); 2001 OPENSSL_free(p);
2002 X509_free(cert); 2002 X509_free(cert);
2003 return NGX_ERROR; 2003 return NGX_ERROR;
2004 } 2004 }
2034 2034
2035 i2a_ASN1_INTEGER(bio, X509_get_serialNumber(cert)); 2035 i2a_ASN1_INTEGER(bio, X509_get_serialNumber(cert));
2036 len = BIO_pending(bio); 2036 len = BIO_pending(bio);
2037 2037
2038 s->len = len; 2038 s->len = len;
2039 s->data = ngx_palloc(pool, len); 2039 s->data = ngx_pnalloc(pool, len);
2040 if (s->data == NULL) { 2040 if (s->data == NULL) {
2041 BIO_free(bio); 2041 BIO_free(bio);
2042 X509_free(cert); 2042 X509_free(cert);
2043 return NGX_ERROR; 2043 return NGX_ERROR;
2044 } 2044 }