From e8cfedb34d853b6c86a83ba12a3884eaf28a5451 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Wed, 28 Oct 2015 07:10:13 +0000
Subject: [PATCH 1/3] Move example ACME client to acme subpkg

---
 examples/acme_client.py => acme/examples/example_client.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename examples/acme_client.py => acme/examples/example_client.py (100%)

diff --git a/examples/acme_client.py b/acme/examples/example_client.py
similarity index 100%
rename from examples/acme_client.py
rename to acme/examples/example_client.py

From f42515ebe4df620921db592e3cde9ddb75a7005b Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Wed, 28 Oct 2015 07:16:40 +0000
Subject: [PATCH 2/3] Include example ACME client in docs

---
 acme/docs/index.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/acme/docs/index.rst b/acme/docs/index.rst
index 8d298054e..a200808da 100644
--- a/acme/docs/index.rst
+++ b/acme/docs/index.rst
@@ -17,6 +17,12 @@ Contents:
    :members:
 
 
+Example client:
+
+.. include:: ../examples/example_client.py
+   :code: python
+
+
 Indices and tables
 ==================
 

From 323f9a10a1e20e616cbf22e5ccf2d5e5516b36cf Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Wed, 28 Oct 2015 07:26:52 +0000
Subject: [PATCH 3/3] Update example ACME client to work with Boulder

---
 acme/acme/testdata/README          |   6 +++---
 acme/acme/testdata/cert.der        | Bin 377 -> 771 bytes
 acme/acme/testdata/csr.der         | Bin 210 -> 607 bytes
 acme/acme/testdata/rsa2048_key.pem |  27 +++++++++++++++++++++++++++
 acme/examples/example_client.py    |   4 ++--
 5 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 acme/acme/testdata/rsa2048_key.pem

diff --git a/acme/acme/testdata/README b/acme/acme/testdata/README
index 11bca55e5..dfe3f5405 100644
--- a/acme/acme/testdata/README
+++ b/acme/acme/testdata/README
@@ -4,12 +4,12 @@ to use appropriate extension for vector filenames: .pem for PEM and
 
 The following command has been used to generate test keys:
 
-  for x in 256 512 1024; do openssl genrsa -out rsa${k}_key.pem $k; done
+  for x in 256 512 1024 2048; do openssl genrsa -out rsa${k}_key.pem $k; done
 
 and for the CSR:
 
-  openssl req -key rsa512_key.pem -new -subj '/CN=example.com' -outform DER > csr.der
+  openssl req -key rsa2048_key.pem -new -subj '/CN=example.com' -outform DER > csr.der
 
 and for the certificate:
 
-  openssl req -key rsa512_key.pem -new -subj '/CN=example.com' -x509 -outform DER > cert.der
+  openssl req -key rsa2047_key.pem -new -subj '/CN=example.com' -x509 -outform DER > cert.der
diff --git a/acme/acme/testdata/cert.der b/acme/acme/testdata/cert.der
index 5f1018505d81a50ed3239d829533deac5fcc2085..ab231982f25ba5b804bc3e4249ec71f8a98109ab 100644
GIT binary patch
delta 676
zcmV;V0$ct00)qw^FoFXAFoFT+paTK{0s;vD!GbbZT8w0>kr*u*F)%VXFgG$ZG%;Ei
z4KXz_F)}wWH!?IdF_B&xe}VxbFbxI?Duzgg_YDC70R;d9f&mWzFoFRJ0)hbn0PuVn
zFn5TUAL295=kO%LM}nSV0Cs?}j^6(<E^9tLVfSUcTy<MSpKe&+iyR^!qB`Lh1;l}B
zP+fGf$^>Oi-f*9qo2j6=x!V{K8;&aU<&F-RI29<kY5JAJW}q`2e-R!nFWhBZcAA0n
zbr$1k3e-fI9ZRb2Y)ga7w;;wD7H)u=$Npgm!E7^U@YgdW;bE{$PuNFH=P4jFQ>O8%
zld7Z4fcu;4&+FkVruZ1kp7d(v3v-9~!hGOJB9JhHd1LNh4#-X9kUhXI+oHN?r!`88
z97z;ty1!m4{8!1ZBA&QL?j6why;pO+J3mKr<%2n26wHQY1l7i#{!}z6vumf3&=fWF
zHVyL02Ouf)^_JEvWuvqeyjV9d9|i+e9U}x7FcyFm^fnFh$p;`Q^Yxb2D`lg!6}(tC
zlNkXXe}Vx40PR%mGTHF`qfZ|f`W9WB?Zir{Hw4`a_UhE50Ig1562Q&I3%9!Yc<Qh*
zwVbDpp3__M1W8MUEInQowK8k#uB&ZGNAFuQ8W0?m%=|5mZN(mJXlA&9Y-~UV)h9#_
zaHWVyG^B<FszbOZwefobTlgG93}ZI9Fm*ebe`J&B3KvH8wL#&VdVy;uWl#;rs$l^$
z`oEeE5=C`|@lb*mYFE57b@YVJ_6xI{pz|z=*4k5-(iDE=LpD)38?ssGPr7Dv7MRo7
z3013bs!fd{$dM@lD-?g0Z7e8gMdAvudtw40`_SX-vrFnyyjG%U=Gn!UhZyt;4LjQu
K2HI?PG3Jt@XDVm_

delta 295
zcmZo>`^h9>(8O2@#PSQ6nHZUvI2qO+nwIZ<+c0LLgs!B4nURr!iGhK!d6YP>p{ap6
zj5{$-sy@bmmyJ`a&7<u*FC!x(D+9APgMkN=Bg2}~;w^!1<?pU52y*^&|9JETol<F$
z9i@yc0#D_cQ(f=gUq0Vt-QRsLSzGSAi#6Wt^gh>@EAwlr%Zv3bCH`*@J!N8MWMEtz
zVBlvU%f=ik%f}+dBBFNw#9Qy{Q#L(OWsXqkXE{)Eb-GfQfjmfFnMJ}ttO1*fuE`G>
z<(wQDc)I@!HO%vwut#mfG=<e=JSl~jL_L-oe{+Are7`J?|LjBQxQo7r<a>7{>z}O6
Yi?Kd^cJYN9>LqE5%h;CwZnWA40D^aK-~a#s

diff --git a/acme/acme/testdata/csr.der b/acme/acme/testdata/csr.der
index adc29ff18463752b4b9ab26a0dd77d2621363725..d43ac85a16a5ec7cb3db7895f0c67f9e0a52f492 100644
GIT binary patch
literal 607
zcmV-l0-*gcf&yDGf&oJU0RS)-F%&Qo1_M<D0}KmgcwudDY-KKEZ*4Gw0U|IB1_>&L
zNQU<f0RaI800V*n4*)QN0SW?w0RaH;d>Jrzh?pPZGtcMnB*I66o?!rXfU%C=|1mCW
zK0RUgWxQN<TST93Sl^2rA|IkU;THwOfof1)bg{|=Wli32pPHMgpt-r*7!ezeD)i-!
z4wyI<D7b0*mBVJBGaV5gEic?<Ty~m)^K};EX$sUtnH@{2?rckg%eNrL85VAUn#cZO
z2*GSKXYkiEB;jGOOi$QHOy?;eGgGGVs*|dt%z*ow>(A@qET;Gv%bxUV<qLC%_`-bP
zNFtChgLz}_Uk=Dk<d8kUF59BIXs0zwiyTQ5Xu7{%EBsf<ub#L@?j6why;pO+J3mKr
z<%2n26wHQY1l7i#{!}z6vumdU0|5X5pa3up1_>&LNQU<f0RamI00V*n0RVFLFiPq$
zDx#l^yE}6WYqbEt_RkwzEzwCOt>#G~q&8=D4keLkuj9-(Pt^OR@O_IPL=QHku|DZK
zfPJiAQB4p_Swh3a05oAZ^u*Ninui6~Hq0^p1q5)wAV5^0MOfjL!Rrv=Ri3Y<#X`fc
zl^_!WP#SW@J_cxpHkAXbC<m1;qRyOXcM92-fN^1)&QbQs2+aXsvQQb$;+GW?YtK%a
zJ=PIL5`h@dnh&B=KlJ@Y3+v7eB^mBdv6*DC(Yw=2J*qAo@Bn9MrJL-sw!QANqMbrz
tEA?L~byan9=2}t1jaHER`8c1&>T@t28BvIGy*v3BV8s=BjO0B=Nwm)83Y7o=

delta 192
zcmcc5a*2`Epz*vx^+XPt`WORVHcqWJkGAi;jEsz|49wmP1|Cd~3~Ne@w*<bGzq_s=
z$obFx<Ixv%N~J}1lrpjiJe6lob-jCk`FxXgfA_s)ZMp9*)_Aki`&?hH%&(~~FV?q|
z_`f~$l!=*<fpGx?vgzDF(;XRH`~4g1I~|vCGD{2g3K{*~zL{gzN<G~}M*m)0*IA1_
on=k+8u;t!=a{}d82I?oJD1V=|ZOxYlKl_DM(yt5p&S1L+05LF4CIA2c

diff --git a/acme/acme/testdata/rsa2048_key.pem b/acme/acme/testdata/rsa2048_key.pem
new file mode 100644
index 000000000..33efd3467
--- /dev/null
+++ b/acme/acme/testdata/rsa2048_key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA8HwZMHeImB/iM8/n8CTCR4KeYQB2gLGO3v8xLms+PWH3Zbxc
+dVtEn25Y34scIh+iOuEXBcSBalBddLHKBGVN3nCfmpupoLm52xgRG44q9OWODpg4
+FSi4afqVw2agMx0RHi0v3GVcdpqB83UW42kK1ESZHUuq7mxLg8u3IMYZFm6Amsf+
+YQjBbDNn8NczJOFhsExP2EdM5ykgM1Om8aqTqqPMgPub68/r4Sym+BjLnvRq5Qtz
+h/jCfOBIIpAwg3lj7l8OyE3kkD3ALtuiuminNUqLHEkUaLq/Xiv8V8mvnrhG7h3Q
++L1Xc707P0dz5YM5XxTMhmUE1cae/lQ0KbNrpwIDAQABAoIBAAiDXCDrGlrIRimv
+YnaN1pLRfOnSKl/D6VrbjdIm2b0yip9/W4aMBJHgRiUjt4s9s3CCJ1585lftIGHR
+KWWecHM/aWb/u7GE4Z9v6qsfDUY+GhlKKjIVjvGxfTu9lk446TI4R0l2DR/luFP2
+ASlrvoZlJ0ZyN0rZapLv0zvFx32Tukd+3rcMmXfHl7aRGMZG1YTKNmBJ4d9iJ6cP
+HG3fgSzLQMPLNO/20MzbXdREG5FNQtwaMuFnIcVbtMCvc/71lQQEfANMLCUweEed
+YWGOjgDeh+731nJsopel+2TSTgnf5VhcFrgChZZdqeKvP+HbXjTE2VkWo7BrzoM7
+xICYBwECgYEA/ZF/JOjZfwIMUdikv8vldJzRMdFryl4NJWnh4NeThNOEpUcpxnyK
+wyMnnQaGJa51u9EEnzl0sZ2h2ODjD6KFpz6fkWaVRq5SWalVPAoKZGaoPZV3IUOI
+8Tm0xkXho+A/FUUEcxCLME+3V9EdPfHaVRJOrbfDyxvNhsj4w9F0aAkCgYEA8sp7
+XTrolOknJGv4Qt1w6gcm5+cMtLaRfi8ZHPHujl2x9eWE8/s2818az7jc0Xr/G4HQ
+NeU+3Es4BblEckSHmhUZhx26cZgkLSIIDofEtaEc6u8CyWfxsWvn3l4T3kMdeSLC
+9UoLk59AH2tkMIh8vzV8LSisLJa341lMdgryQi8CgYAlJKr7PSCe+i3Tz2hSsAts
+iYwbQBIKErzaPihYRzvUuSc1DreP26535y5mUg5UdrnISVXj/Qaa/fw3SLn6EFSD
+qyi0o9I6CE8H00YpBU+AZYk/fCV3Oe1VaJ6SbKog1zhmZTXBpSq+aO7ybi9aY5MX
+4xajW8fSeMAifk3yYTwsAQKBgErcEcOCOVpItU/uloKPYpRWFjHktK83p46fmP+q
+vOJak1d9KExOBfhuN4caucNBSE1D7l3fzE0CSEjDgg41gRYKMW/Ow8DopybfWlqY
+lBdokNEDVvmgug35dmnC2h9q1DiYdkJJTV57+Lp3U1H/k28lX59Q7h1lb1eDHic7
+YszzAoGBAOx05dhOiYbzAJSTQu3oBHFn4mTYIqCcDO6cQrEJwPKAq7mAhT0yOk9N
+CrqRV/1aes665829cyTwcAZl6nqbzHv5XjX5+g6vmooCb4oCkq49rumHjoQdrX8D
+RR5b+Spkc1jo4rctCcExzSkgo+K5N3oBVYznecje7O7Z0/qiJE/8
+-----END RSA PRIVATE KEY-----
diff --git a/acme/examples/example_client.py b/acme/examples/example_client.py
index f9408c2af..b4b5ad010 100644
--- a/acme/examples/example_client.py
+++ b/acme/examples/example_client.py
@@ -15,7 +15,7 @@ from acme import jose
 logging.basicConfig(level=logging.DEBUG)
 
 
-NEW_REG_URL = 'https://www.letsencrypt-demo.org/acme/new-reg'
+DIRECTORY_URL = 'https://acme-staging.api.letsencrypt.org/directory'
 BITS = 2048  # minimum for Boulder
 DOMAIN = 'example1.com'  # example.com is ignored by Boulder
 
@@ -24,7 +24,7 @@ key = jose.JWKRSA(key=rsa.generate_private_key(
     public_exponent=65537,
     key_size=BITS,
     backend=default_backend()))
-acme = client.Client(NEW_REG_URL, key)
+acme = client.Client(DIRECTORY_URL, key)
 
 regr = acme.register()
 logging.info('Auto-accepting TOS: %s', regr.terms_of_service)